From: Christoph Lameter Date: Sun, 17 Aug 2014 17:30:32 +0000 (-0500) Subject: drivers/clocksource: Replace __get_cpu_var used for address calculation X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=27d051677977da11dc50caeb210204b587c94eb5;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo --- 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);