fix backfire kernel module for Linux v3.4-rc1 and laterNotice: this object is not reachable from any branch.

Notice: this object is not reachable from any branch.

4 files changed, 19 insertions, 8 deletions

diff --git a/debian/backfire-dkms.dkms b/debian/backfire-dkms.dkms
index 39bf8f3..8126bbc 100644
--- a/debian/backfire-dkms.dkms
+++ b/debian/backfire-dkms.dkms
@@ -1,5 +1,5 @@
 PACKAGE_NAME="backfire"
-PACKAGE_VERSION="0.73-1"
+PACKAGE_VERSION="0.84-2"
 MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build"
 CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
 DEST_MODULE_LOCATION[0]=/extra
diff --git a/debian/backfire-dkms.install b/debian/backfire-dkms.install
index b1f8961..7990486 100644
--- a/debian/backfire-dkms.install
+++ b/debian/backfire-dkms.install
@@ -1 +1 @@
-/usr/src/backfire/* /usr/src/backfire-0.73-1/
+/usr/src/backfire/* /usr/src/backfire-0.84-2/
diff --git a/debian/changelog b/debian/changelog
index ba022e0..4137ee2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rt-tests (0.84-2) UNRELEASED; urgency=low
+
+  * fix backfire kernel module for Linux v3.4-rc1 and later
+
+ -- Uwe Kleine-König <u.kleine-koenig@pengutronix.de>  Thu, 08 Nov 2012 22:35:01 +0100
+
 rt-tests (0.84-1) experimental; urgency=low
 
   * new upstream release
diff --git a/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch b/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch
index 6be2f5f..3c60508 100644
--- a/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch
+++ b/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch
@@ -4,15 +4,16 @@ 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.
+<linux/smp_lock.h> is gone since v2.6.39-rc1~467^2. Also <asm/system.h>
+is gone for most architectures since v3.4-rc1~54^2.
 
-The module builds fine for Debian's 2.6.32 kernel with this change.
+The module builds fine for Debian's 2.6.32 and 3.6 kernels 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 file changed, 1 insertion(+), 2 deletions(-)
+ src/backfire/backfire.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 --- a/src/backfire/backfire.c
 +++ b/src/backfire/backfire.c
@@ -24,7 +25,11 @@ Forwarded: id:1313844843-6405-1-git-send-email-u.kleine-koenig@pengutronix.de
  #include <linux/types.h>
  #include <linux/errno.h>
  #include <linux/miscdevice.h>
-@@ -36,7 +35,7 @@
+@@ -32,11 +31,10 @@
+ #include <linux/spinlock.h>
+ 
+ #include <asm/uaccess.h>
+-#include <asm/system.h>
  
  #define BACKFIRE_MINOR MISC_DYNAMIC_MINOR