summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/apic.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-26 12:47:40 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-26 12:49:34 +0100
commit0917c01f8e793f57a53cf886533d4c75c67f6e89 (patch)
tree0aaf2e2107ecb54f28bcd97c2b9706842f395552 /arch/x86/include/asm/apic.h
parentx86: don't compile vsmp_64 for 32bit (diff)
downloadlinux-0917c01f8e793f57a53cf886533d4c75c67f6e89.tar.xz
linux-0917c01f8e793f57a53cf886533d4c75c67f6e89.zip
x86: remove update_apic from x86_quirks, fix
Impact: build fix wakeup_secondary_cpu_via_init(), the default platform method for booting a secondary CPU, is always used on UP due to probe_32.c, if CONFIG_X86_LOCAL_APIC is enabled but SMP is off. So provide a UP wrapper inline as well. Cc: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r--arch/x86/include/asm/apic.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 24e21273e30b..0fbf6f1520fa 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -331,10 +331,27 @@ struct apic {
u32 (*safe_wait_icr_idle)(void);
};
+/*
+ * Pointer to the local APIC driver in use on this system (there's
+ * always just one such driver in use - the kernel decides via an
+ * early probing process which one it picks - and then sticks to it):
+ */
extern struct apic *apic;
+
+/*
+ * APIC functionality to boot other CPUs - only used on SMP:
+ */
+#ifdef CONFIG_SMP
extern atomic_t init_deasserted;
extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
+#else
+static inline int
+wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip)
+{
+ return 0;
+}
+#endif
static inline u32 apic_read(u32 reg)
{