summaryrefslogtreecommitdiffstats
path: root/extras/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extras/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch')
-rw-r--r--extras/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch71
1 files changed, 71 insertions, 0 deletions
diff --git a/extras/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch b/extras/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch
new file mode 100644
index 00000000..eab3ec63
--- /dev/null
+++ b/extras/recipes-ti/dsplink/ti-dsplink/dsplink-BKL-fix.patch
@@ -0,0 +1,71 @@
1From e0931bf37628727903a567f1c7096ae0011edc3d Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 4 Jan 2011 13:49:05 +0100
4Subject: [PATCH] Adjust drv_pmgr for post 2.6.36 ioctl changes
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c | 17 ++++++++++++++++-
9 1 files changed, 16 insertions(+), 1 deletions(-)
10
11diff --git a/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c b/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c
12index a9b831c..e4a836d 100644
13--- a/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c
14+++ b/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c
15@@ -399,10 +399,15 @@ DRV_Release (struct inode * inode, struct file * filp) ;
16 * @see None
17 * ----------------------------------------------------------------------------
18 */
19+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
20 STATIC
21 int
22 DRV_Ioctl (struct inode * inode, struct file * filp,
23 unsigned int cmd, unsigned long args) ;
24+#else
25+STATIC
26+int DRV_Ioctl (struct file *filp, unsigned int cmd, unsigned long args);
27+#endif
28
29
30 /** ----------------------------------------------------------------------------
31@@ -495,7 +500,11 @@ STATIC struct file_operations driverOps = {
32 open: DRV_Open,
33 flush: DRV_Flush,
34 release: DRV_Release,
35+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
36 ioctl: DRV_Ioctl,
37+#else
38+ unlocked_ioctl: DRV_Ioctl,
39+#endif
40 mmap: DRV_Mmap,
41 read: DRV_Read,
42 .owner = THIS_MODULE
43@@ -817,10 +826,16 @@ DRV_Release (struct inode * inode, struct file * filp)
44 * @desc Function to invoke the APIs through ioctl.
45 * ----------------------------------------------------------------------------
46 */
47+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
48 STATIC
49 NORMAL_API
50 int DRV_Ioctl (struct inode * inode, struct file * filp,
51 unsigned int cmd, unsigned long args)
52+#else
53+STATIC
54+NORMAL_API
55+int DRV_Ioctl (struct file *filp, unsigned int cmd, unsigned long args)
56+#endif
57 {
58 DSP_STATUS status = DSP_SOK ;
59 int osStatus = 0 ;
60@@ -829,7 +844,7 @@ int DRV_Ioctl (struct inode * inode, struct file * filp,
61 CMD_Args apiArgs ;
62
63
64- TRC_4ENTER ("DRV_Ioctl", inode, filp, cmd, args) ;
65+ TRC_3ENTER ("DRV_Ioctl", filp, cmd, args) ;
66
67 retVal = copy_from_user ((Pvoid) &apiArgs,
68 (const Pvoid) srcAddr,
69--
701.6.6.1
71