projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski...
[linux-2.6-block.git]
/
drivers
/
iommu
/
irq_remapping.c
diff --git
a/drivers/iommu/irq_remapping.c
b/drivers/iommu/irq_remapping.c
index 8adaaeae32681d863c568eddbfd9af5e12bdc205..49721b4e1975c3c1b038665aa9f18749d95e06e6 100644
(file)
--- a/
drivers/iommu/irq_remapping.c
+++ b/
drivers/iommu/irq_remapping.c
@@
-36,7
+36,7
@@
static void irq_remapping_disable_io_apic(void)
* As this gets called during crash dump, keep this simple for
* now.
*/
- if (
cpu_has_apic
|| apic_from_smp_config())
+ if (
boot_cpu_has(X86_FEATURE_APIC)
|| apic_from_smp_config())
disconnect_bsp_APIC(0);
}