diff options
author | Dimitri Sivanich <sivanich@sgi.com> | 2009-03-04 17:02:46 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:27:49 -0500 |
commit | 1400b3faab8fedfffde5a7fe47098e2732d4aa76 (patch) | |
tree | b8e3a32d232c0d992c74929d00d01bd100c64149 /arch/x86/kernel/uv_time.c | |
parent | 5ab5ab34498f94d60884c4ccea890601e429042e (diff) |
x86: UV, SGI RTC: fix uv_time.c for UP
Fix non-smp build of uv_time.c.
Signed-off-by: Dimitri Sivanich <sivanich@sgi.com>
LKML-Reference: <20090304220246.GC6288@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/uv_time.c')
-rw-r--r-- | arch/x86/kernel/uv_time.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/uv_time.c b/arch/x86/kernel/uv_time.c index 6f8e3256ab2a..2ffb6c53326e 100644 --- a/arch/x86/kernel/uv_time.c +++ b/arch/x86/kernel/uv_time.c | |||
@@ -24,6 +24,8 @@ | |||
24 | #include <asm/uv/uv_hub.h> | 24 | #include <asm/uv/uv_hub.h> |
25 | #include <asm/uv/bios.h> | 25 | #include <asm/uv/bios.h> |
26 | #include <asm/uv/uv.h> | 26 | #include <asm/uv/uv.h> |
27 | #include <asm/apic.h> | ||
28 | #include <asm/cpu.h> | ||
27 | 29 | ||
28 | #define RTC_NAME "sgi_rtc" | 30 | #define RTC_NAME "sgi_rtc" |
29 | 31 | ||
@@ -84,7 +86,7 @@ static void uv_rtc_send_IPI(int cpu) | |||
84 | unsigned long apicid, val; | 86 | unsigned long apicid, val; |
85 | int pnode; | 87 | int pnode; |
86 | 88 | ||
87 | apicid = per_cpu(x86_cpu_to_apicid, cpu); | 89 | apicid = cpu_physical_id(cpu); |
88 | pnode = uv_apicid_to_pnode(apicid); | 90 | pnode = uv_apicid_to_pnode(apicid); |
89 | val = (1UL << UVH_IPI_INT_SEND_SHFT) | | 91 | val = (1UL << UVH_IPI_INT_SEND_SHFT) | |
90 | (apicid << UVH_IPI_INT_APIC_ID_SHFT) | | 92 | (apicid << UVH_IPI_INT_APIC_ID_SHFT) | |