gator-module-5.7: Add patch fixing release_pmu() usage in Linaro 3.0 kernel

... together with related changes needed to use quilt.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>

5 files changed, 57 insertions, 1 deletions

diff --git a/gator-module-5.7/debian/changelog b/gator-module-5.7/debian/changelog
index f5f0dc5..004a594 100644
--- a/gator-module-5.7/debian/changelog
+++ b/gator-module-5.7/debian/changelog
@@ -1,3 +1,10 @@
+gator-module (5.7-2) natty; urgency=low
+
+  * Added quilt infrastructure
+  * Add patch fixing release_pmu() use (for Linaro 3.0 kernel)
+
+ -- Pawel Moll <pawel.moll@arm.com>  Mon, 10 Oct 2011 13:00:40 +0100
+
 gator-module (5.7-1) natty; urgency=low
 
   * Updated to DS-5.7 release
diff --git a/gator-module-5.7/debian/control.source b/gator-module-5.7/debian/control.source
index e3a3c86..9e80a6e 100644
--- a/gator-module-5.7/debian/control.source
+++ b/gator-module-5.7/debian/control.source
@@ -2,7 +2,7 @@ Source: gator-module
 Section: devel
 Priority: extra
 Maintainer: Pawel Moll <pawel.moll@arm.com>
-Build-Depends: debhelper (>= 7.0.5), HEADERS
+Build-Depends: debhelper (>= 7.0.8), HEADERS
 Standards-Version: 3.8.4
 Homepage: http://www.arm.com/ds-5
 
diff --git a/gator-module-5.7/debian/patches/gator-module-fix_release_pmu_call_for_linaro_3_0.patch b/gator-module-5.7/debian/patches/gator-module-fix_release_pmu_call_for_linaro_3_0.patch
new file mode 100644
index 0000000..dc1cd41
--- /dev/null
+++ b/gator-module-5.7/debian/patches/gator-module-fix_release_pmu_call_for_linaro_3_0.patch
@@ -0,0 +1,46 @@
+Index: driver/gator_ebs.c
+===================================================================
+--- driver.orig/gator_ebs.c	2011-10-10 12:27:49.000000000 +0100
++++ driver/gator_ebs.c	2011-10-10 12:28:05.000000000 +0100
+@@ -102,7 +102,12 @@
+ 		init_pmu(ARM_PMU_DEVICE_CPU);
+ 		if (pmu_device->num_resources == 0) {
+ 			pr_err("gator: no irqs for PMUs defined\n");
++/* Should actually be < (3, 1, 0), but Linaro merged some 3.1-rc changes into 3.0 */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
+ 			release_pmu(pmu_device);
++#else
++			release_pmu(ARM_PMU_DEVICE_CPU);
++#endif
+ 			pmu_device = NULL;
+ 			return -1;
+ 		}
+@@ -121,7 +126,12 @@
+ 					if (irq >= 0)
+ 						free_irq(irq, NULL);
+ 				}
++/* Should actually be < (3, 1, 0), but Linaro merged some 3.1-rc changes into 3.0 */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
+ 				release_pmu(pmu_device);
++#else
++				release_pmu(ARM_PMU_DEVICE_CPU);
++#endif
+ 				pmu_device = NULL;
+ 				return -1;
+ 			}
+@@ -148,8 +158,14 @@
+ 				free_irq(irq, NULL);
+ 		}
+ 	}
+-	if (!IS_ERR(pmu_device))
++	if (!IS_ERR(pmu_device)) {
++/* Should actually be < (3, 1, 0), but Linaro merged some 3.1-rc changes into 3.0 */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
+ 		release_pmu(pmu_device);
++#else
++		release_pmu(ARM_PMU_DEVICE_CPU);
++#endif
++	}
+ 	pmu_device = NULL;
+ #endif
+ }
diff --git a/gator-module-5.7/debian/patches/series b/gator-module-5.7/debian/patches/series
new file mode 100644
index 0000000..eb0c775
--- /dev/null
+++ b/gator-module-5.7/debian/patches/series
@@ -0,0 +1 @@
+gator-module-fix_release_pmu_call_for_linaro_3_0.patch
diff --git a/gator-module-5.7/debian/rules b/gator-module-5.7/debian/rules
index 0d0d51e..337859d 100755
--- a/gator-module-5.7/debian/rules
+++ b/gator-module-5.7/debian/rules
@@ -25,6 +25,7 @@ debian/control: debian/rules debian/control.source debian/control.binary
 
 build: debian/control
 	dh_testdir
+	dh_quilt_patch
 
 install:
 	dh_testdir
@@ -66,5 +67,6 @@ binary-%: debian/control
 
 clean: debian/control
 	dh_testdir
+	dh_quilt_unpatch
 	dh_clean
 	rm -Rf $(sname)-*