From: Chris Metcalf <cmetcalf@tilera.com>
Date: Thu, 6 Mar 2014 20:31:59 +0000 (-0500)
Subject: tile: don't use __get_cpu_var() with structure-typed arguments
X-Git-Tag: firefly_0821_release~176^2~4122^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2e285458e62fe202cb81b831f41779c7e7e5cbe6;p=firefly-linux-kernel-4.4.55.git

tile: don't use __get_cpu_var() with structure-typed arguments

This no longer works with the new per-cpu infrastructure.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---

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;