From 8eb0050b23bf5870d6b0cbd3e3ac5385b927d4af Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Mon, 12 Nov 2007 13:55:21 +0900 Subject: [PATCH] --- yaml --- r: 75091 b: refs/heads/master c: 17fbe0043e9d623e46a57b153aa0b80ee9de7790 h: refs/heads/master i: 75089: 7ef2846ab548a4631671971c4cf52ccca1e69f0a 75087: c5fab569df50222a7d73496a4e22177d052999a7 v: v3 --- [refs] | 2 +- trunk/arch/ia64/hp/common/sba_iommu.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 089b26e97e5b..fb61147938b0 100644 --- 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 index bc859a311eaf..45bf04eb7d70 100644 --- 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