1 files changed, 4 insertions, 4 deletions

diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index c1b362277fb7..b854a1cd0079 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -162,7 +162,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
 
 void setup_tile_timer(void)
 {
-        struct clock_event_device *evt = &__get_cpu_var(tile_timer);
+        struct clock_event_device *evt = this_cpu_ptr(&tile_timer);
 
         /* Fill in fields that are speed-specific. */
         clockevents_calc_mult_shift(evt, cycles_per_sec, TILE_MINSEC);
@@ -182,7 +182,7 @@ void setup_tile_timer(void)
 void do_timer_interrupt(struct pt_regs *regs, int fault_num)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
-        struct clock_event_device *evt = &__get_cpu_var(tile_timer);
+        struct clock_event_device *evt = this_cpu_ptr(&tile_timer);
 
         /*
          * Mask the timer interrupt here, since we are a oneshot timer
@@ -194,7 +194,7 @@ void do_timer_interrupt(struct pt_regs *regs, int fault_num)
         irq_enter();
 
         /* Track interrupt count. */
-        __get_cpu_var(irq_stat).irq_timer_count++;
+        __this_cpu_inc(irq_stat.irq_timer_count);
 
         /* Call the generic timer handler */
         evt->event_handler(evt);
@@ -235,7 +235,7 @@ cycles_t ns2cycles(unsigned long nsecs)
          * We do not have to disable preemption here as each core has the same
          * clock frequency.
          */
-        struct clock_event_device *dev = &__raw_get_cpu_var(tile_timer);
+        struct clock_event_device *dev = raw_cpu_ptr(&tile_timer);
 
         /*
          * as in clocksource.h and x86's timer.h, we split the calculation