summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/apic.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-01-15 21:22:14 +0000
committerThomas Gleixner <tglx@linutronix.de>2015-01-22 15:10:54 +0100
commit2ca5b40479246087695d9e6343075b47ee6887ea (patch)
tree1d6d6cc40b1828bc5d6b6bb48ed2753c289f6f42 /arch/x86/include/asm/apic.h
parentbfb050702990d6a2033d072cb2af583aee5c6fc5 (diff)
x86/ioapic: Check x2apic really
The x2apic_preenabled flag is just a horrible hack and if X2APIC support is disabled it does not reflect the actual hardware state. Check the hardware instead. 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.541280622@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.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index d2225fdc953e..392bbcf35471 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -178,7 +178,6 @@ static inline u64 native_x2apic_icr_read(void)
extern int x2apic_mode;
extern int x2apic_phys;
-extern int x2apic_preenabled;
extern void check_x2apic(void);
extern void enable_x2apic(void);
static inline int x2apic_enabled(void)
@@ -210,7 +209,6 @@ static inline void x2apic_force_phys(void)
}
#define x2apic_mode (0)
-#define x2apic_preenabled (0)
#define x2apic_supported() (0)
#endif