diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-05-20 10:09:26 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-20 10:09:26 +0300 |
commit | 06cd3d8c14bdd06f49f1c6a06acf219749c5598e (patch) | |
tree | b9dd9ad824e489803072b9517dc01c0d75a4f918 /arch/x86/kernel/apic/io_apic.c | |
parent | 0f6ff2bce0d4c3e4ff34f5d2ffb7329025b30844 (diff) | |
parent | bc231d9ede99518b67a77544d9084f15b898fe2e (diff) | |
download | linux-06cd3d8c14bdd06f49f1c6a06acf219749c5598e.tar.xz |
Merge branch 'linus' into x86/urgent, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index fdb0fbfb1197..84e33ff5a6d5 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1454,7 +1454,7 @@ void native_disable_io_apic(void) ioapic_write_entry(ioapic_i8259.apic, ioapic_i8259.pin, entry); } - if (cpu_has_apic || apic_from_smp_config()) + if (boot_cpu_has(X86_FEATURE_APIC) || apic_from_smp_config()) disconnect_bsp_APIC(ioapic_i8259.pin != -1); } |