From 1bf9650366db3958b843192e97aae898b3df9689 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Sun, 1 Jul 2012 18:05:06 +0300 Subject: [PATCH] --- yaml --- r: 315859 b: refs/heads/master c: f9808b7fd422b965cea52e05ba470e0a473c53d3 h: refs/heads/master i: 315857: 26b46e4ef570b341b00632e8310c83d3a4fba158 315855: b58280d91c0b58cb3f633ea2f6761b0dd031ea8a v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/apic.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1756c06baf4f..a3314684bd40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae7a2a3fb6f8b784c2752863f4f1f20c656f76fb +refs/heads/master: f9808b7fd422b965cea52e05ba470e0a473c53d3 diff --git a/trunk/arch/x86/include/asm/apic.h b/trunk/arch/x86/include/asm/apic.h index eaff4790ed96..aa5b2eec3602 100644 --- a/trunk/arch/x86/include/asm/apic.h +++ b/trunk/arch/x86/include/asm/apic.h @@ -417,7 +417,12 @@ extern struct apic *apic; __aligned(sizeof(struct apic *)) \ __section(.apicdrivers) = { &sym1, &sym2 } +#ifdef CONFIG_X86_LOCAL_APIC extern struct apic *__apicdrivers[], *__apicdrivers_end[]; +#else +#define __apicdrivers ((struct apic **)NULL) +#define __apicdrivers_end ((struct apic **)NULL) +#endif /* * APIC functionality to boot other CPUs - only used on SMP: