From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762242Ab3DBUbc (ORCPT ); Tue, 2 Apr 2013 16:31:32 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:3252 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759674Ab3DBUba (ORCPT ); Tue, 2 Apr 2013 16:31:30 -0400 X-IronPort-AV: E=Sophos;i="4.87,394,1363158000"; d="scan'208";a="35356418" From: Stephen Boyd To: John Stultz , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Rutland , Marc Zyngier Subject: [PATCH] ARM: arch_timer: Silence debug preempt warnings Date: Tue, 2 Apr 2013 13:31:12 -0700 Message-Id: <1364934672-31554-1-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 1.8.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 but we use this_cpu_ptr() to retrieve the clockevent unconditionally. We're only going to actually use the pointer in non-preemptible context though, so use __this_cpu_ptr() instead to avoid the preemptible checks and silence the warning. Cc: Mark Rutland Cc: Marc Zyngier Signed-off-by: Stephen Boyd --- drivers/clocksource/arm_arch_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index d7ad425..5928c29 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -248,7 +248,7 @@ 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); + struct clock_event_device *evt = __this_cpu_ptr(arch_timer_evt); switch (action & ~CPU_TASKS_FROZEN) { case CPU_STARTING: -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation