diff --git a/[refs] b/[refs] index 3adbf81c143d..dc979f970789 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc1829a4c378d793fb3b95d56135d89a0d7ff72a +refs/heads/master: 1ff5683043196b9ad628a5de6bf8eeca52ee8bfd diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index b739be2a6dc9..c9fefdb1a7db 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -1081,7 +1081,8 @@ static int static_obj(void *obj) */ for_each_possible_cpu(i) { start = (unsigned long) &__per_cpu_start + per_cpu_offset(i); - end = (unsigned long) &__per_cpu_end + per_cpu_offset(i); + end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM + + per_cpu_offset(i); if ((addr >= start) && (addr < end)) return 1;