diff options
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.patch | 71 |
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 @@ +From e0931bf37628727903a567f1c7096ae0011edc3d Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Tue, 4 Jan 2011 13:49:05 +0100 +Subject: [PATCH] Adjust drv_pmgr for post 2.6.36 ioctl changes + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c | 17 ++++++++++++++++- + 1 files changed, 16 insertions(+), 1 deletions(-) + +diff --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 +index a9b831c..e4a836d 100644 +--- a/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c ++++ b/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c +@@ -399,10 +399,15 @@ DRV_Release (struct inode * inode, struct file * filp) ; + * @see None + * ---------------------------------------------------------------------------- + */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) + STATIC + int + DRV_Ioctl (struct inode * inode, struct file * filp, + unsigned int cmd, unsigned long args) ; ++#else ++STATIC ++int DRV_Ioctl (struct file *filp, unsigned int cmd, unsigned long args); ++#endif + + + /** ---------------------------------------------------------------------------- +@@ -495,7 +500,11 @@ STATIC struct file_operations driverOps = { + open: DRV_Open, + flush: DRV_Flush, + release: DRV_Release, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) + ioctl: DRV_Ioctl, ++#else ++ unlocked_ioctl: DRV_Ioctl, ++#endif + mmap: DRV_Mmap, + read: DRV_Read, + .owner = THIS_MODULE +@@ -817,10 +826,16 @@ DRV_Release (struct inode * inode, struct file * filp) + * @desc Function to invoke the APIs through ioctl. + * ---------------------------------------------------------------------------- + */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) + STATIC + NORMAL_API + int DRV_Ioctl (struct inode * inode, struct file * filp, + unsigned int cmd, unsigned long args) ++#else ++STATIC ++NORMAL_API ++int DRV_Ioctl (struct file *filp, unsigned int cmd, unsigned long args) ++#endif + { + DSP_STATUS status = DSP_SOK ; + int osStatus = 0 ; +@@ -829,7 +844,7 @@ int DRV_Ioctl (struct inode * inode, struct file * filp, + CMD_Args apiArgs ; + + +- TRC_4ENTER ("DRV_Ioctl", inode, filp, cmd, args) ; ++ TRC_3ENTER ("DRV_Ioctl", filp, cmd, args) ; + + retVal = copy_from_user ((Pvoid) &apiArgs, + (const Pvoid) srcAddr, +-- +1.6.6.1 + |