Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: arch_timer: Silence debug preempt warnings

Hot-plugging with CONFIG_DEBUG_PREEMPT=y on a device with arm
architected timers causes a slew of "using smp_processor_id() in
preemptible" warnings:

BUG: using smp_processor_id() in preemptible [00000000] code: sh/111
caller is arch_timer_cpu_notify+0x14/0xc8

This happens because sometimes the cpu notifier,
arch_timer_cpu_notify(), is called in preemptible context and
other times in non-preemptible context but we use this_cpu_ptr()
to retrieve the clockevent in all cases. We're only going to
actually use the pointer in non-preemptible context though, so
push the this_cpu_ptr() access down into the cases to force the
checks to occur only in non-preemptible contexts.

Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Acked-by: Marc Zyngier <Marc.Zyngier@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

authored by

Stephen Boyd and committed by
Olof Johansson
f31c2f1c 405f5e5e

+6 -4
+6 -4
drivers/clocksource/arm_arch_timer.c
··· 248 248 static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self, 249 249 unsigned long action, void *hcpu) 250 250 { 251 - struct clock_event_device *evt = this_cpu_ptr(arch_timer_evt); 252 - 251 + /* 252 + * Grab cpu pointer in each case to avoid spurious 253 + * preemptible warnings 254 + */ 253 255 switch (action & ~CPU_TASKS_FROZEN) { 254 256 case CPU_STARTING: 255 - arch_timer_setup(evt); 257 + arch_timer_setup(this_cpu_ptr(arch_timer_evt)); 256 258 break; 257 259 case CPU_DYING: 258 - arch_timer_stop(evt); 260 + arch_timer_stop(this_cpu_ptr(arch_timer_evt)); 259 261 break; 260 262 } 261 263