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 14de1ab223c864c00a866ebbba6d68d3fc50cb6c..5709ae9c3e771d2f82a1bda2a23d500d8f4faffe 100644 (file)
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -631,16 +631,13 @@ static int __init intel_enable_irq_remapping(void)
 {
        struct dmar_drhd_unit *drhd;
        struct intel_iommu *iommu;
-       int setup = 0;
+       bool setup = false;
        int eim = 0;
 
        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) {
@@ -697,7 +694,7 @@ static int __init intel_enable_irq_remapping(void)
         */
        for_each_iommu(iommu, drhd) {
                iommu_set_irq_remapping(iommu, eim);
-               setup = 1;
+               setup = true;
        }
 
        if (!setup)
@@ -856,7 +853,7 @@ static int __init parse_ioapics_under_ir(void)
 {
        struct dmar_drhd_unit *drhd;
        struct intel_iommu *iommu;
-       int ir_supported = 0;
+       bool ir_supported = false;
        int ioapic_idx;
 
        for_each_iommu(iommu, drhd)
@@ -864,7 +861,7 @@ static int __init parse_ioapics_under_ir(void)
                        if (ir_parse_ioapic_hpet_scope(drhd->hdr, iommu))
                                return -1;
 
-                       ir_supported = 1;
+                       ir_supported = true;
                }
 
        if (!ir_supported)
@@ -917,7 +914,7 @@ static void disable_irq_remapping(void)
 static int reenable_irq_remapping(int eim)
 {
        struct dmar_drhd_unit *drhd;
-       int setup = 0;
+       bool setup = false;
        struct intel_iommu *iommu = NULL;
 
        for_each_iommu(iommu, drhd)
@@ -933,7 +930,7 @@ static int reenable_irq_remapping(int eim)
 
                /* Set up interrupt remapping for iommu.*/
                iommu_set_irq_remapping(iommu, eim);
-               setup = 1;
+               setup = true;
        }
 
        if (!setup)