From a0ef2e3621af6320ccbac895f7eecbe697f2beb6 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Sat, 18 Oct 2008 20:28:28 -0700 Subject: [PATCH] --- yaml --- r: 115951 b: refs/heads/master c: 630bf20747e27391b20f137a5be2edb4235ca8fa h: refs/heads/master i: 115949: 21db502ebf00845754a5fc1693653d7cf5853c4b 115947: 79a675c8a8bf321ae0dbfe24c2ef6a913c60b6e7 115943: 6b2024e6b9846d1dbf7775edd6a3ae06807aed3d 115935: e40004623f77bed575ea51f2857a84d6adab4ab2 v: v3 --- [refs] | 2 +- trunk/arch/ia64/hp/common/sba_iommu.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f28f15e73f51..5d57aa2dbe24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e515a0d60066c802cc605a5d9c446948f7691519 +refs/heads/master: 630bf20747e27391b20f137a5be2edb4235ca8fa diff --git a/trunk/arch/ia64/hp/common/sba_iommu.c b/trunk/arch/ia64/hp/common/sba_iommu.c index 4956be40d7b5..d98f0f4ff83f 100644 --- a/trunk/arch/ia64/hp/common/sba_iommu.c +++ b/trunk/arch/ia64/hp/common/sba_iommu.c @@ -2070,14 +2070,13 @@ sba_init(void) if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb")) return 0; -#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP) && \ - defined(CONFIG_PROC_FS) +#if defined(CONFIG_IA64_GENERIC) /* 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 * a successful kdump kernel boot is to use the swiotlb. */ - if (elfcorehdr_addr < ELFCORE_ADDR_MAX) { + if (is_kdump_kernel()) { if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0) panic("Unable to initialize software I/O TLB:" " Try machvec=dig boot option");