From b6ded99a38905556a6442acc40dd94e47be9f786 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Wed, 17 Apr 2013 16:26:18 -0700 Subject: [PATCH] --- yaml --- r: 374202 b: refs/heads/master c: f31c2f1c68aff83277eddc6798adf3438e9c680a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/arm_arch_timer.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 528736f8af2c..8c9ee1c030fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 405f5e5ee53339cf5d5d1753f8614938b1222562 +refs/heads/master: f31c2f1c68aff83277eddc6798adf3438e9c680a diff --git a/trunk/drivers/clocksource/arm_arch_timer.c b/trunk/drivers/clocksource/arm_arch_timer.c index 122ff05628b5..a2b254189782 100644 --- a/trunk/drivers/clocksource/arm_arch_timer.c +++ b/trunk/drivers/clocksource/arm_arch_timer.c @@ -248,14 +248,16 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk) static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) { - struct clock_event_device *evt = this_cpu_ptr(arch_timer_evt); - + /* + * Grab cpu pointer in each case to avoid spurious + * preemptible warnings + */ switch (action & ~CPU_TASKS_FROZEN) { case CPU_STARTING: - arch_timer_setup(evt); + arch_timer_setup(this_cpu_ptr(arch_timer_evt)); break; case CPU_DYING: - arch_timer_stop(evt); + arch_timer_stop(this_cpu_ptr(arch_timer_evt)); break; }