diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-01 09:45:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-01 09:45:46 -0700 |
| commit | 78a74485e7bf833a1fac8b0326d4c1dcce843a6e (patch) | |
| tree | ce32f20d1698ff6db38e9b54164c7982063afaf3 | |
| parent | 7b7a917a0d6160a15ba34b203874f98de90af192 (diff) | |
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>
| -rw-r--r-- | kernel/lockdep.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |