diff options
| author | Borislav Petkov <bp@suse.de> | 2016-03-29 17:41:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-31 13:35:08 +0200 |
| commit | 62436a4d36c94d202784cd8a997ff8bb4b880237 (patch) | |
| tree | 804e14ee81591e862c135a14b0b184742707dd9a /arch/x86/kernel/apic | |
| parent | ab4a56fa2c6ce9384ca077b6570c56fe18361f17 (diff) | |
| download | linux-stable-62436a4d36c94d202784cd8a997ff8bb4b880237.tar.gz linux-stable-62436a4d36c94d202784cd8a997ff8bb4b880237.tar.bz2 linux-stable-62436a4d36c94d202784cd8a997ff8bb4b880237.zip | |
x86/cpufeature: Remove cpu_has_x2apic
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Tony Luck <tony.luck@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1459266123-21878-5-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index d356987a04e9..d7867c885bf8 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1561,7 +1561,7 @@ void __init check_x2apic(void) pr_info("x2apic: enabled by BIOS, switching to x2apic ops\n"); x2apic_mode = 1; x2apic_state = X2APIC_ON; - } else if (!cpu_has_x2apic) { + } else if (!boot_cpu_has(X86_FEATURE_X2APIC)) { x2apic_state = X2APIC_DISABLED; } } |