Merge remote-tracking branch 'dwmw2-iommu/master'

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/iommu/intel_irq_remapping.c
index 6c25b3c5b729b97dd61e5ae09a9167d7f05234cb,07d1a6848ad7bf7a1e5ac05098d7dd213ed64081..5709ae9c3e771d2f82a1bda2a23d500d8f4faffe
--- 1/drivers/iommu/intel_irq_remapping.c
--- 2/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@@ -631,16 -599,23 +631,13 @@@ static int __init intel_enable_irq_rema
  {
        struct dmar_drhd_unit *drhd;
        struct intel_iommu *iommu;
 -      bool x2apic_present;
 -      int setup = 0;
 +      bool setup = false;
        int eim = 0;
  
 -      x2apic_present = x2apic_supported();
 -
 -      if (parse_ioapics_under_ir() != 1) {
 -              printk(KERN_INFO "Not enable interrupt remapping\n");
 -              goto error;
 -      }
 -
 -      if (x2apic_present) {
 -              pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n");
 -
 +      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) {