1 files changed, 4 insertions, 4 deletions

diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 694619365265..dd2af74aff80 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -1309,12 +1309,12 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs)
                 bfin_write_TIMER_STATUS(1); /* Latch TIMIL0 */
 #endif
                 /* This is basically what we need from the register frame. */
-                __raw_get_cpu_var(__ipipe_tick_regs).ipend = regs->ipend;
-                __raw_get_cpu_var(__ipipe_tick_regs).pc = regs->pc;
+                __this_cpu_write(__ipipe_tick_regs.ipend, regs->ipend);
+                __this_cpu_write(__ipipe_tick_regs.pc, regs->pc);
                 if (this_domain != ipipe_root_domain)
-                        __raw_get_cpu_var(__ipipe_tick_regs).ipend &= ~0x10;
+                        __this_cpu_and(__ipipe_tick_regs.ipend, ~0x10);
                 else
-                        __raw_get_cpu_var(__ipipe_tick_regs).ipend |= 0x10;
+                        __this_cpu_or(__ipipe_tick_regs.ipend, 0x10);
         }
 
         /*