git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/intel-iommu
[sfrench/cifs-2.6.git]
/
drivers
/
iommu
/
intel_irq_remapping.c
diff --git
a/drivers/iommu/intel_irq_remapping.c
b/drivers/iommu/intel_irq_remapping.c
index 6c25b3c5b729b97dd61e5ae09a9167d7f05234cb..5709ae9c3e771d2f82a1bda2a23d500d8f4faffe 100644
(file)
--- a/
drivers/iommu/intel_irq_remapping.c
+++ b/
drivers/iommu/intel_irq_remapping.c
@@
-637,10
+637,7
@@
static int __init intel_enable_irq_remapping(void)
if (x2apic_supported()) {
eim = !dmar_x2apic_optout();
if (!eim)
if (x2apic_supported()) {
eim = !dmar_x2apic_optout();
if (!eim)
- printk(KERN_WARNING
- "Your BIOS is broken and requested that x2apic be disabled.\n"
- "This will slightly decrease performance.\n"
- "Use 'intremap=no_x2apic_optout' to override BIOS request.\n");
+ pr_info("x2apic is disabled because BIOS sets x2apic opt out bit. You can use 'intremap=no_x2apic_optout' to override the BIOS setting.\n");
}
for_each_iommu(iommu, drhd) {
}
for_each_iommu(iommu, drhd) {