diff --git a/[refs] b/[refs] index c98cb25227d0..e5f0c7456dbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 696a02cc16b182dd78b1f395ae336f449cc90f11 +refs/heads/master: 1cc85961e214773cb7d7f2ccbe3bc644dd466df0 diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index eacc10b03531..1050d6d3922c 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -2014,7 +2014,7 @@ void synchronize_sched_expedited(void) /* Note that atomic_inc_return() implies full memory barrier. */ firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started); get_online_cpus(); - WARN_ON_ONCE(cpu_is_offline(smp_processor_id())); + WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id())); /* * Each pass through the following loop attempts to force a