Linux 2.6.32.15

Linux 2.6.32.15

[Greg KH]

I'm announcing the release of the 2.6.32.15 kernel.

It reverts two patches that were previously applied that shouldn't have
been in the .32 kernel series.  If you don't have any problems with the
2.6.34.14 kernel, there's no need to upgrade to this release.

The updated 2.6.32.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.y.git
and can be browsed at the normal kernel.org git web browser:
        http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.32.y.git;a=summary

thanks,

greg k-h

------------

 Makefile         |    2 +-
 kernel/lockdep.c |    6 +++---
 kernel/module.c  |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Greg Kroah-Hartman (3):
      Revert "lockdep: fix incorrect percpu usage"
      Revert "modules: fix incorrect percpu usage"
      Linux 2.6.32.15

Re: Linux 2.6.32.15

[Greg KH]

diff --git a/Makefile b/Makefile
index 47866f8..36fead3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 32
-EXTRAVERSION = .14
+EXTRAVERSION = .15
 NAME = Man-Eating Seals of Antiquity
 
 # *DOCUMENTATION*
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 */