From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 1 Jun 2010 16:45:46 +0000 (-0700)
Subject: Revert "lockdep: fix incorrect percpu usage"
X-Git-Tag: firefly_0821_release~10186^2~1585
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=78a74485e7bf833a1fac8b0326d4c1dcce843a6e;p=firefly-linux-kernel-4.4.55.git

Revert "lockdep: fix incorrect percpu usage"

This reverts commit b6b3dcd55e2327a968833ff3f22eda3b8dd7ef9e.

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

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index f672d519c3db..9af56723c096 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;