summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-08-20 15:01:38 +0200
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-08-20 15:01:38 +0200
commitcd6e5800356414cee855788632a68fbc7e9a138e (patch)
treed987e6bf78440b6d271b4d81c5fca74d97e31aa5
parent2601f579508879105272d882cd407aca0527f201 (diff)
downloadrt-tests-cd6e5800356414cee855788632a68fbc7e9a138e.tar.gz
new patch fixing a build failure in the backfire kernel module
Notice: this object is not reachable from any branch.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Notice: this object is not reachable from any branch.
-rw-r--r--debian/patches/backfire-fix-build-failure-for-modern-kernels.patch40
-rw-r--r--debian/patches/series1
2 files changed, 41 insertions, 0 deletions
diff --git a/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch b/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch
new file mode 100644
index 0000000..2059dd8
--- /dev/null
+++ b/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch
@@ -0,0 +1,40 @@
+From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Subject: backfire: fix build failure for modern kernels
+
+SPIN_LOCK_UNLOCKED doesn't work any more since v2.6.39-rc1~511^2~11
+(locking: Remove deprecated lock initializers). DEFINE_SPINLOCK is
+available since v2.6.14-rc1~223, so it should be ok to depend on that.
+<linux/smp_lock.h> is gone since v2.6.39-rc1~467^2.
+
+The module builds fine for Debian's 2.6.32 kernel with this change.
+
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Forwarded: id:1313844843-6405-1-git-send-email-u.kleine-koenig@pengutronix.de
+---
+ src/backfire/backfire.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/backfire/backfire.c b/src/backfire/backfire.c
+index aaf9c4a..0e9a0df 100644
+--- a/src/backfire/backfire.c
++++ b/src/backfire/backfire.c
+@@ -24,7 +24,6 @@
+ #include <linux/sched.h>
+ #include <linux/cpumask.h>
+ #include <linux/time.h>
+-#include <linux/smp_lock.h>
+ #include <linux/types.h>
+ #include <linux/errno.h>
+ #include <linux/miscdevice.h>
+@@ -36,7 +35,7 @@
+
+ #define BACKFIRE_MINOR MISC_DYNAMIC_MINOR
+
+-static spinlock_t backfire_state_lock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(backfire_state_lock);
+ static int backfire_open_cnt; /* #times opened */
+ static int backfire_open_mode; /* special open modes */
+ static struct timeval sendtime; /* when the most recent signal was sent */
+--
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
index b9c0499..25c8655 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debian_adapt_errormsg_on_failure_to_open_device
manpage_pip_stress.patch
debian_has_recent_glibc
fix_comment_about_realtime_group.patch
+backfire-fix-build-failure-for-modern-kernels.patch