diff options
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index c12823eb55b5..47c2d12e5cf5 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -1265,14 +1265,7 @@ void __cpuinit end_local_APIC_setup(void) | |||
1265 | #ifdef CONFIG_X86_X2APIC | 1265 | #ifdef CONFIG_X86_X2APIC |
1266 | void check_x2apic(void) | 1266 | void check_x2apic(void) |
1267 | { | 1267 | { |
1268 | int msr, msr2; | 1268 | if (x2apic_enabled()) { |
1269 | |||
1270 | if (!cpu_has_x2apic) | ||
1271 | return; | ||
1272 | |||
1273 | rdmsr(MSR_IA32_APICBASE, msr, msr2); | ||
1274 | |||
1275 | if (msr & X2APIC_ENABLE) { | ||
1276 | pr_info("x2apic enabled by BIOS, switching to x2apic ops\n"); | 1269 | pr_info("x2apic enabled by BIOS, switching to x2apic ops\n"); |
1277 | x2apic_preenabled = x2apic = 1; | 1270 | x2apic_preenabled = x2apic = 1; |
1278 | } | 1271 | } |