diff options
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r-- | arch/x86/include/asm/apic.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index a6208dc74633..860504178e94 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -325,6 +325,9 @@ struct apic { | |||
325 | }; | 325 | }; |
326 | 326 | ||
327 | extern struct apic *apic; | 327 | extern struct apic *apic; |
328 | extern atomic_t init_deasserted; | ||
329 | extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip); | ||
330 | extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip); | ||
328 | 331 | ||
329 | static inline u32 apic_read(u32 reg) | 332 | static inline u32 apic_read(u32 reg) |
330 | { | 333 | { |
@@ -384,9 +387,7 @@ static inline unsigned default_get_apic_id(unsigned long x) | |||
384 | #define DEFAULT_TRAMPOLINE_PHYS_LOW 0x467 | 387 | #define DEFAULT_TRAMPOLINE_PHYS_LOW 0x467 |
385 | #define DEFAULT_TRAMPOLINE_PHYS_HIGH 0x469 | 388 | #define DEFAULT_TRAMPOLINE_PHYS_HIGH 0x469 |
386 | 389 | ||
387 | #ifdef CONFIG_X86_32 | 390 | #ifdef CONFIG_X86_64 |
388 | extern void es7000_update_apic_to_cluster(void); | ||
389 | #else | ||
390 | extern struct apic apic_flat; | 391 | extern struct apic apic_flat; |
391 | extern struct apic apic_physflat; | 392 | extern struct apic apic_physflat; |
392 | extern struct apic apic_x2apic_cluster; | 393 | extern struct apic apic_x2apic_cluster; |