aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/apic.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r--arch/x86/include/asm/apic.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 067c2f83e329..2201c262b00c 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -335,9 +335,6 @@ struct apic {
335 /* wakeup_secondary_cpu */ 335 /* wakeup_secondary_cpu */
336 int (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip); 336 int (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip);
337 337
338 int trampoline_phys_low;
339 int trampoline_phys_high;
340
341 bool wait_for_init_deassert; 338 bool wait_for_init_deassert;
342 void (*smp_callin_clear_local_apic)(void); 339 void (*smp_callin_clear_local_apic)(void);
343 void (*inquire_remote_apic)(int apicid); 340 void (*inquire_remote_apic)(int apicid);
@@ -480,10 +477,10 @@ static inline unsigned default_get_apic_id(unsigned long x)
480} 477}
481 478
482/* 479/*
483 * Warm reset vector default position: 480 * Warm reset vector position:
484 */ 481 */
485#define DEFAULT_TRAMPOLINE_PHYS_LOW 0x467 482#define TRAMPOLINE_PHYS_LOW 0x467
486#define DEFAULT_TRAMPOLINE_PHYS_HIGH 0x469 483#define TRAMPOLINE_PHYS_HIGH 0x469
487 484
488#ifdef CONFIG_X86_64 485#ifdef CONFIG_X86_64
489extern void apic_send_IPI_self(int vector); 486extern void apic_send_IPI_self(int vector);