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

Dimitri Sivanich
2009-03-04T22:02:57Z

Fix non-smp build of uv_time.c.

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

---

This time against tip/x86/uv

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

Index: linux-2.6.tip-uv/arch/x86/kernel/uv_time.c
===================================================================
--- linux-2.6.tip-uv.orig/arch/x86/kernel/uv_time.c 2009-03-04 15:52:10.000000000 -0600
+++ linux-2.6.tip-uv/arch/x86/kernel/uv_time.c 2009-03-04 15:58:48.000000000 -0600
@@ -20,6 +20,9 @@
*/
#include <linux/clockchips.h>

+#include <asm/apic.h>
+#include <asm/cpu.h>
+
#include <asm/uv/uv_mmrs.h>
#include <asm/uv/uv_hub.h>
#include <asm/uv/bios.h>
@@ -84,7 +87,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) |