From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755476AbYHEJs5 (ORCPT ); Tue, 5 Aug 2008 05:48:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755214AbYHEJsb (ORCPT ); Tue, 5 Aug 2008 05:48:31 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:39186 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755042AbYHEJs3 (ORCPT ); Tue, 5 Aug 2008 05:48:29 -0400 Date: Tue, 5 Aug 2008 19:48:27 +1000 From: Simon Horman To: kexec@lists.infradead.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vivek Goyal , Tony Luck , Andrew Morton Subject: kdump, ia64: always reserve elfcore header memory in crash kernel Message-ID: <20080805094825.GA9712@verge.net.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 elfcore header memory needs to be reserved in a crash kernel. This means that the relevant code should be protected by CONFIG_CRASH_DUMP rather than CONFIG_PROC_VMCORE. Signed-off-by: Simon Horman --- Andrew, this patch fixes bug in the (unlikely) case where an ia64 crashdump kernel does not have CONFIG_PROC_FS set. I think it is worth including in 2.6.27. But breakage cases are likely to be minimal to non-existent, so I am comfortable with post 2.6.27 too. This patch should be appended to the series, "is_kdump_kernel() cleanup and related patches". http://lists.infradead.org/pipermail/kexec/2008-July/002270.html Index: linux-2.6/arch/ia64/kernel/efi.c =================================================================== --- linux-2.6.orig/arch/ia64/kernel/efi.c 2008-08-05 18:31:13.000000000 +1000 +++ linux-2.6/arch/ia64/kernel/efi.c 2008-08-05 18:31:21.000000000 +1000 @@ -1334,7 +1334,7 @@ kdump_find_rsvd_region (unsigned long si } #endif -#ifdef CONFIG_PROC_VMCORE +#ifdef CONFIG_CRASH_DUMP /* locate the size find a the descriptor at a certain address */ unsigned long __init vmcore_find_descriptor_size (unsigned long address) Index: linux-2.6/arch/ia64/kernel/setup.c =================================================================== --- linux-2.6.orig/arch/ia64/kernel/setup.c 2008-08-05 18:31:20.000000000 +1000 +++ linux-2.6/arch/ia64/kernel/setup.c 2008-08-05 18:31:21.000000000 +1000 @@ -352,7 +352,7 @@ reserve_memory (void) } #endif -#ifdef CONFIG_PROC_VMCORE +#ifdef CONFIG_CRASH_KERNEL if (reserve_elfcorehdr(&rsvd_region[n].start, &rsvd_region[n].end) == 0) n++; @@ -496,9 +496,7 @@ static int __init parse_elfcorehdr(char return 0; } early_param("elfcorehdr", parse_elfcorehdr); -#endif -#ifdef CONFIG_PROC_VMCORE int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end) { unsigned long length;