[PATCH 4/3 v7] SGI RTC: fix uv_time for UP

Dimitri Sivanich
2009-03-04T20:45:33Z

Fix UP build of uv_time.c.

Signed-off-by: Dimitri Sivanich <sivanich@sgi.com>

---

arch/x86/kernel/uv_time.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux/arch/x86/kernel/uv_time.c
===================================================================
--- linux.orig/arch/x86/kernel/uv_time.c 2009-03-04 12:32:58.000000000 -0600
+++ linux/arch/x86/kernel/uv_time.c 2009-03-04 14:23:32.000000000 -0600
@@ -19,6 +19,8 @@
* Copyright (c) Dimitri Sivanich
*/
#include <linux/clockchips.h>
+#include <asm/apic.h>
+#include <asm/cpu.h>
#include <asm/uv/uv.h>
#include <asm/uv/uv_mmrs.h>
#include <asm/uv/uv_hub.h>
@@ -81,7 +83,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) |