diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-15 16:22:17 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-22 09:10:54 -0500 |
commit | d524165cb8dbb2ce5916cd7682236b9324ae2644 (patch) | |
tree | a8ea3e36ab009ddfed5ea834ca15c67c21e169ed /arch/x86/include/asm/apic.h | |
parent | 9aa16365275a272283acbda665634ca3dc8b46fe (diff) |
x86/apic: Check x2apic early
No point in delaying the x2apic detection for the CONFIG_X86_X2APIC=n
case to enable_IR_x2apic(). We rather detect that before we try to
setup anything there.
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/20150115211702.702479404@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r-- | arch/x86/include/asm/apic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 392bbcf35471..ca8deb484d03 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -178,7 +178,7 @@ static inline u64 native_x2apic_icr_read(void) | |||
178 | 178 | ||
179 | extern int x2apic_mode; | 179 | extern int x2apic_mode; |
180 | extern int x2apic_phys; | 180 | extern int x2apic_phys; |
181 | extern void check_x2apic(void); | 181 | extern void __init check_x2apic(void); |
182 | extern void enable_x2apic(void); | 182 | extern void enable_x2apic(void); |
183 | static inline int x2apic_enabled(void) | 183 | static inline int x2apic_enabled(void) |
184 | { | 184 | { |