From 8cf545db724a1befc93f939bda17d864204532fc Mon Sep 17 00:00:00 2001
From: Dimitri Sivanich <sivanich@sgi.com>
Date: Wed, 4 Mar 2009 16:02:46 -0600
Subject: [PATCH] --- yaml --- r: 138691 b: refs/heads/master c:
 1400b3faab8fedfffde5a7fe47098e2732d4aa76 h: refs/heads/master i:   138689:
 1bd8d7fc411bf4a710e44ed34a4e242280dcc791   138687:
 48de3aeb906e7162d417213f981a58e5784833ee v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/uv_time.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1afce51492a6..b72679372675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ab5ab34498f94d60884c4ccea890601e429042e
+refs/heads/master: 1400b3faab8fedfffde5a7fe47098e2732d4aa76
diff --git a/trunk/arch/x86/kernel/uv_time.c b/trunk/arch/x86/kernel/uv_time.c
index 6f8e3256ab2a..2ffb6c53326e 100644
--- a/trunk/arch/x86/kernel/uv_time.c
+++ b/trunk/arch/x86/kernel/uv_time.c
@@ -24,6 +24,8 @@
 #include <asm/uv/uv_hub.h>
 #include <asm/uv/bios.h>
 #include <asm/uv/uv.h>
+#include <asm/apic.h>
+#include <asm/cpu.h>
 
 #define RTC_NAME		"sgi_rtc"
 
@@ -84,7 +86,7 @@ static void uv_rtc_send_IPI(int cpu)
 	unsigned long apicid, val;
 	int pnode;
 
-	apicid = per_cpu(x86_cpu_to_apicid, cpu);
+	apicid = cpu_physical_id(cpu);
 	pnode = uv_apicid_to_pnode(apicid);
 	val = (1UL << UVH_IPI_INT_SEND_SHFT) |
 	      (apicid << UVH_IPI_INT_APIC_ID_SHFT) |