From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755407AbYG2XPf (ORCPT ); Tue, 29 Jul 2008 19:15:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752944AbYG2XPN (ORCPT ); Tue, 29 Jul 2008 19:15:13 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:45519 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752886AbYG2XPL (ORCPT ); Tue, 29 Jul 2008 19:15:11 -0400 Date: Wed, 30 Jul 2008 09:15:10 +1000 From: Simon Horman To: kexec@lists.infradead.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vivek Goyal Subject: Re: [patch 1/3] kdump: use is_kdump_kernel() in sba_init() Message-ID: <20080729231507.GF6370@verge.net.au> References: <20080729081235.293361145@vergenet.net> <20080729081629.356523305@vergenet.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080729081629.356523305@vergenet.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Vivek Goyal 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");