---

yaml --- r: 168795 b: refs/heads/master c: 5854d9c h: refs/heads/master i: 168793: 49d6f08 168791: ccb3906 v: v3
git-mirror · Nov 19, 2009 · aed7d49 · aed7d49
1 parent 5ef166d
commit aed7d49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b00a7c93ec782d118d2c03bd599cfd041e80a1
+refs/heads/master: 5854d9c8d18359b1fc2f23c0ef2d51dd53281bd6
diff --git a/trunk/drivers/pci/dmar.c b/trunk/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;