summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorDimitri Sivanich <sivanich@sgi.com>2009-03-04 16:02:46 -0600
committerIngo Molnar <mingo@elte.hu>2009-03-05 11:27:49 +0100
commit1400b3faab8fedfffde5a7fe47098e2732d4aa76 (patch)
treeb8e3a32d232c0d992c74929d00d01bd100c64149 /arch/x86/kernel
parent5ab5ab34498f94d60884c4ccea890601e429042e (diff)
downloadblackbird-op-linux-1400b3faab8fedfffde5a7fe47098e2732d4aa76.tar.gz
blackbird-op-linux-1400b3faab8fedfffde5a7fe47098e2732d4aa76.zip
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')
-rw-r--r--arch/x86/kernel/uv_time.c4
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 @@
#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) |
OpenPOWER on IntegriCloud