On Wed, Jul 30, 2008 at 09:15:10AM +1000, Simon Horman wrote: > After recent patches* is_kdump_kernel() should return 1 in the > case where code is executing in a crashkernel and 0 otherwise. > It is safe to use outside of CONFIG_CRASH_DUMP. > > * http://lkml.org/lkml/2008/7/28/445 > > Signed-off-by: Simon Horman <horms at verge.net.au> > Acked-by: Vivek Goyal <vgoyal at redhat.com> > > Index: linux-2.6/arch/ia64/hp/common/sba_iommu.c > =================================================================== > --- linux-2.6.orig/arch/ia64/hp/common/sba_iommu.c 2008-07-29 10:57:17.000000000 +1000 > +++ linux-2.6/arch/ia64/hp/common/sba_iommu.c 2008-07-29 10:57:51.000000000 +1000 > @@ -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"); Looks good to me. Acked-by: Vivek Goyal <vgoyal at redhat.com> Thanks Vivek
