diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-15 21:22:26 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-22 15:10:55 +0100 |
| commit | 659006bf3ae37a08706907ce1a36ddf57c9131d2 (patch) | |
| tree | 750a08e8d94d010d0c2ef275d54574551913b4ad /arch/x86/include | |
| parent | 44e25ff9e6912347a1a54c757fc75681d0dc42d0 (diff) | |
x86/x2apic: Split enable and setup function
enable_x2apic() is a convoluted unreadable mess because it is used for
both enablement in early boot and for setup in cpu_init().
Split the code into x2apic_enable() for enablement and x2apic_setup()
for setup of (secondary cpus). Make use of the new state tracking to
simplify the logic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/20150115211703.129287153@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 5d7488e9b66..ac60c603f8d 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -179,7 +179,7 @@ static inline u64 native_x2apic_icr_read(void) extern int x2apic_mode; extern int x2apic_phys; extern void __init check_x2apic(void); -extern void enable_x2apic(void); +extern void x2apic_setup(void); static inline int x2apic_enabled(void) { return cpu_has_x2apic && apic_is_x2apic_enabled(); @@ -188,7 +188,7 @@ static inline int x2apic_enabled(void) #define x2apic_supported() (cpu_has_x2apic) #else static inline void check_x2apic(void) { } -static inline void enable_x2apic(void) { } +static inline void x2apic_setup(void) { } static inline int x2apic_enabled(void) { return 0; } #define x2apic_mode (0) |