1 files changed, 2 insertions, 2 deletions

diff --git a/arch/tile/kernel/messaging.c b/arch/tile/kernel/messaging.c
index 00331af9525d..7867266f9716 100644
--- a/arch/tile/kernel/messaging.c
+++ b/arch/tile/kernel/messaging.c
@@ -68,8 +68,8 @@ void hv_message_intr(struct pt_regs *regs, int intnum)
 #endif
 
         while (1) {
-                rmi = hv_receive_message(__get_cpu_var(msg_state),
-                                         (HV_VirtAddr) message,
+                HV_MsgState *state = this_cpu_ptr(&msg_state);
+                rmi = hv_receive_message(*state, (HV_VirtAddr) message,
                                          sizeof(message));
                 if (rmi.msglen == 0)
                         break;