Commit-ID: 1400b3faab8fedfffde5a7fe47098e2732d4aa76 Gitweb: http://git.kernel.org/tip/1400b3faab8fedfffde5a7fe47098e2732d4aa76 Author: "Dimitri Sivanich" <sivanich@xxxxxxx> AuthorDate: Wed, 4 Mar 2009 16:02:46 -0600 Commit: Ingo Molnar <mingo@xxxxxxx> CommitDate: Thu, 5 Mar 2009 11:27:49 +0100 x86: UV, SGI RTC: fix uv_time.c for UP Fix non-smp build of uv_time.c. Signed-off-by: Dimitri Sivanich <sivanich@xxxxxxx> LKML-Reference: <20090304220246.GC6288@xxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- 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 6f8e325..2ffb6c5 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) | -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html