summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-08-17 12:30:32 -0500
committerTejun Heo <tj@kernel.org>2014-08-26 13:45:46 -0400
commit27d051677977da11dc50caeb210204b587c94eb5 (patch)
tree8ad7c397df9c40f5281cc3c501bad7be6db66c51
parent879d92745a1a5a6573dee83cfa2953413fed23fc (diff)
downloadlinux-stable-27d051677977da11dc50caeb210204b587c94eb5.tar.gz
linux-stable-27d051677977da11dc50caeb210204b587c94eb5.tar.bz2
linux-stable-27d051677977da11dc50caeb210204b587c94eb5.zip
drivers/clocksource: Replace __get_cpu_var used for address calculation
Replace __get_cpu_var used for address calculation with this_cpu_ptr. Acked-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/clocksource/metag_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c
index 9e4db41abe3c..b7384b853e5a 100644
--- a/drivers/clocksource/metag_generic.c
+++ b/drivers/clocksource/metag_generic.c
@@ -90,7 +90,7 @@ static struct clocksource clocksource_metag = {
static irqreturn_t metag_timer_interrupt(int irq, void *dummy)
{
- struct clock_event_device *evt = &__get_cpu_var(local_clockevent);
+ struct clock_event_device *evt = this_cpu_ptr(&local_clockevent);
evt->event_handler(evt);