[oe-commits] Koen Kooi : ti-linuxutils 2.26.01.02: fix up the last BKL removal breakage

git version control git at git.openembedded.org
Thu Dec 30 16:44:53 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0d7150c3d30f1fed785d256509d8ebc99723920f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0d7150c3d30f1fed785d256509d8ebc99723920f

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Dec 30 17:43:09 2010 +0100

ti-linuxutils 2.26.01.02: fix up the last BKL removal breakage

Upstream fixed everything minus this one

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 .../ti/ti-linuxutils/linuxutils-BKL-fix-2.patch    |   22 ++++++++++++++++++++
 recipes/ti/ti-linuxutils_2.26.01.02.bb             |    2 +
 2 files changed, 24 insertions(+), 0 deletions(-)

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
index 0000000..1438003
--- /dev/null
+++ b/recipes/ti/ti-linuxutils/linuxutils-BKL-fix-2.patch
@@ -0,0 +1,22 @@
+From: Koen Kooi <k-kooi at 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;
diff --git a/recipes/ti/ti-linuxutils_2.26.01.02.bb b/recipes/ti/ti-linuxutils_2.26.01.02.bb
index fbaa66a..2a67e6a 100644
--- a/recipes/ti/ti-linuxutils_2.26.01.02.bb
+++ b/recipes/ti/ti-linuxutils_2.26.01.02.bb
@@ -1,5 +1,7 @@
 require ti-linuxutils.inc
 
+SRC_URI += "file://linuxutils-BKL-fix-2.patch"
+
 PE = "1"
 PV = "2_26_01_02"
 





More information about the Openembedded-commits mailing list