Fix handling of the HP/Acer 'DMAR at zero' BIOS error for machines with <4GiB RAM.

[net-next-2.6.git] / drivers / pci / dmar.c

diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index e5f8fc164fd3329218d6d15a43ba76072c0079b3..b952ebc7a78b67776d985f006fb33633be43b80b 100644 (file)
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -609,6 +609,9 @@ int __init check_zero_address(void)
                                     dmi_get_system_info(DMI_BIOS_VENDOR),
                                     dmi_get_system_info(DMI_BIOS_VERSION),
                                     dmi_get_system_info(DMI_PRODUCT_VERSION));
+#ifdef CONFIG_DMAR
+                               dmar_disabled = 1;
+#endif
                                return 0;
                        }
                        break;