ti-linuxutils 2.26.01.02: fix up the last BKL removal breakage
authorKoen Kooi <koen@openembedded.org>
Thu, 30 Dec 2010 16:43:09 +0000 (17:43 +0100)
committerKoen Kooi <koen@openembedded.org>
Thu, 30 Dec 2010 16:43:09 +0000 (17:43 +0100)
Upstream fixed everything minus this one

Signed-off-by: Koen Kooi <koen@openembedded.org>
recipes/ti/ti-linuxutils/linuxutils-BKL-fix-2.patch [new file with mode: 0644]
recipes/ti/ti-linuxutils_2.26.01.02.bb

diff --git a/recipes/ti/ti-linuxutils/linuxutils-BKL-fix-2.patch b/recipes/ti/ti-linuxutils/linuxutils-BKL-fix-2.patch
new file mode 100644 (file)
index 0000000..1438003
--- /dev/null
@@ -0,0 +1,22 @@
+From: Koen Kooi <k-kooi@ti.com>
+Subject: linuxutils: fix build with 2.6.37rcX
+
+---
+
+--- /tmp/sdmak.c       2010-12-05 18:43:55.000000000 +0100
++++ linuxutils_2_25_05_11/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c   2010-12-05 18:48:31.000000000 +0100
+@@ -208,9 +208,12 @@
+             }
+             up_read(&current->mm->mmap_sem);
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++            sema_init(&(channels[channel].mutex),1);
++#else
+             init_MUTEX_LOCKED(&(channels[channel].mutex));
+-            channels[channel].owner = filp;
++#endif
++                      channels[channel].owner = filp;
+             if (copy_to_user(argp, &channel, sizeof(channel))) {
+                 return -EFAULT;
index fbaa66a..2a67e6a 100644 (file)
@@ -1,5 +1,7 @@
 require ti-linuxutils.inc
 
+SRC_URI += "file://linuxutils-BKL-fix-2.patch"
+
 PE = "1"
 PV = "2_26_01_02"