Revert "lockdep: fix incorrect percpu usage"
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 1 Jun 2010 16:45:46 +0000 (09:45 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 1 Jun 2010 16:45:46 +0000 (09:45 -0700)
This reverts commit b6b3dcd55e2327a968833ff3f22eda3b8dd7ef9e.

It should not have been applied to the .32 kernel tree

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kernel/lockdep.c

index f672d519c3db0b395aed839b0b5aa8392889b611..9af56723c09605a07742180983e465500cef2d9d 100644 (file)
@@ -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;