---

yaml --- r: 75091 b: refs/heads/master c: 17fbe00 h: refs/heads/master i: 75089: 7ef2846 75087: c5fab56 v: v3
git-mirror · Dec 19, 2007 · 8eb0050 · 8eb0050
1 parent de354b1
commit 8eb0050
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64135fa97ce016058f95345425a9ebd04ee1bd2a
+refs/heads/master: 17fbe0043e9d623e46a57b153aa0b80ee9de7790
diff --git a/trunk/arch/ia64/hp/common/sba_iommu.c b/trunk/arch/ia64/hp/common/sba_iommu.c
@@ -2034,7 +2034,8 @@ sba_init(void)
 	if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb"))
 		return 0;
 
-#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP)
+#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP) && \
+        defined(CONFIG_PROC_FS)
 	/* If we are booting a kdump kernel, the sba_iommu will
 	 * cause devices that were not shutdown properly to MCA
 	 * as soon as they are turned back on.  Our only option for