[kernel] r15822 - in dists/sid/linux-2.6/debian: . patches/bugfix/all/stable patches/series

[Ben Hutchings]

Author: benh
Date: Wed Jun  2 03:03:01 2010
New Revision: 15822

Log:
Add stable 2.6.32.15

Reverts two bogus changes, one of which we already reverted and one in code
that we don't build.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.15.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/16

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Jun  2 02:59:55 2010	(r15821)
+++ dists/sid/linux-2.6/debian/changelog	Wed Jun  2 03:03:01 2010	(r15822)
@@ -1,8 +1,12 @@
 linux-2.6 (2.6.32-16) UNRELEASED; urgency=low
 
+  [ dann frazier ]
   * [hppa] clear floating point exception flag on SIGFPE signal
     (Closes: #559406)
 
+  [ Ben Hutchings ]
+  * Add stable 2.6.32.15
+
  -- dann frazier <dannf at debian.org>  Tue, 01 Jun 2010 09:23:57 -0600
 
 linux-2.6 (2.6.32-15) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.15.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.15.patch	Wed Jun  2 03:03:01 2010	(r15822)
@@ -0,0 +1,32 @@
+diff --git a/Makefile b/Makefile
+index 47866f8..36fead3 100644
+diff --git a/kernel/lockdep.c b/kernel/lockdep.c
+index f672d51..9af5672 100644
+--- a/kernel/lockdep.c
++++ b/kernel/lockdep.c
+@@ -591,9 +591,9 @@ static int static_obj(void *obj)
+ 	 * percpu var?
+ 	 */
+ 	for_each_possible_cpu(i) {
+-		start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i);
+-		end   = (unsigned long) per_cpu_ptr(&__per_cpu_start, i)
+-					+ PERCPU_ENOUGH_ROOM;
++		start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
++		end   = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
++					+ per_cpu_offset(i);
+ 
+ 		if ((addr >= start) && (addr < end))
+ 			return 1;
+diff --git a/kernel/module.c b/kernel/module.c
+index a4aae35..dfa33e8 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -555,7 +555,7 @@ static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size)
+ 	int cpu;
+ 
+ 	for_each_possible_cpu(cpu)
+-		memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
++		memcpy(pcpudest + per_cpu_offset(cpu), from, size);
+ }
+ 
+ #else /* ... !CONFIG_SMP */

Modified: dists/sid/linux-2.6/debian/patches/series/16
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/16	Wed Jun  2 02:59:55 2010	(r15821)
+++ dists/sid/linux-2.6/debian/patches/series/16	Wed Jun  2 03:03:01 2010	(r15822)
@@ -1 +1,3 @@
 + bugfix/parisc/clear-fp-exception-flag-on-SIGFPE.patch
+- bugfix/all/revert-percpu-stable-changes-2.patch 
++ bugfix/all/stable/2.6.32.15.patch