Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758333AbXIIR2R (ORCPT ); Sun, 9 Sep 2007 13:28:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756555AbXIIR2D (ORCPT ); Sun, 9 Sep 2007 13:28:03 -0400 Received: from wa-out-1112.google.com ([209.85.146.182]:17410 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756272AbXIIR2B (ORCPT ); Sun, 9 Sep 2007 13:28:01 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=iuaGV980TtUPybgKgHMgmhKreNkH2bwdPYqttsTf97m2JhYL0i2hYLTc44uNk2XdicmzzXTGIKt+GC0XOyTHoN13fH3vuQVJZPxAQZd8hCSpumOPKyh8y7pEWRwppHP5gGseGQMihTamvACEJMWA6vfPXUqZrxXz9+IEm4ogKRY= Message-ID: <86802c440709091027o32a63d11w629bad87abcc19c2@mail.gmail.com> Date: Sun, 9 Sep 2007 10:27:19 -0700 From: "Yinghai Lu" To: "Bernhard Walle" , "Eric W. Biederman" , "Vivek Goyal" Subject: Re: [discuss] [patch 3/5] Use extended crashkernel command line on x86_64 Cc: kexec@lists.infradead.org, linux-arch@vger.kernel.org, discuss@x86-64.org, linux-kernel@vger.kernel.org In-Reply-To: <20070909083914.951336895@strauss.suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20070909083914.065380136@strauss.suse.de> <20070909083914.951336895@strauss.suse.de> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2663 Lines: 78 On 9/9/07, Bernhard Walle wrote: > This patch removes the crashkernel parsing from > arch/x86_64/kernel/machine_kexec.c and calls the generic function, introduced in > the last patch, in setup_bootmem_allocator(). > > This is necessary because the amount of System RAM must be known in this > function now because of the new syntax. > > > Signed-off-by: Bernhard Walle > > > --- > arch/x86_64/kernel/e820.c | 3 ++- > arch/x86_64/kernel/machine_kexec.c | 27 --------------------------- > arch/x86_64/kernel/setup.c | 35 ++++++++++++++++++++++++++++------- > 3 files changed, 30 insertions(+), 35 deletions(-) > > --- a/arch/x86_64/kernel/e820.c > +++ b/arch/x86_64/kernel/e820.c > @@ -226,7 +226,8 @@ void __init e820_reserve_resources(void) > request_resource(res, &code_resource); > request_resource(res, &data_resource); > #ifdef CONFIG_KEXEC ... > --- a/arch/x86_64/kernel/machine_kexec.c > +++ b/arch/x86_64/kernel/machine_kexec.c > @@ -231,33 +231,6 @@ NORET_TYPE void machine_kexec(struct kim > image->start); > } > > -/* crashkernel=size@addr specifies the location to reserve for > - * a crash kernel. By reserving this memory we guarantee > - * that linux never set's it up as a DMA target. > - * Useful for holding code to do something appropriate > - * after a kernel panic. > - */ > -static int __init setup_crashkernel(char *arg) > -{ > - unsigned long size, base; > - char *p; > - if (!arg) > - return -EINVAL; > - size = memparse(arg, &p); > - if (arg == p) > - return -EINVAL; > - if (*p == '@') { > - base = memparse(p+1, &p); > - /* FIXME: Do I want a sanity check to validate the > - * memory range? Yes you do, but it's too early for > - * e820 -AK */ > - crashk_res.start = base; > - crashk_res.end = base + size - 1; > - } > - return 0; > -} > -early_param("crashkernel", setup_crashkernel); > - > void arch_crash_save_vmcoreinfo(void) > { > #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE > --- a/arch/x86_64/kernel/setup.c > +++ b/arch/x86_64/kernel/setup.c > @@ -196,6 +196,33 @@ static inline void copy_edd(void) > } > #endif > > +#ifdef CONFIG_KEXEC ... CONFIG_KEXEC or CONFIG_CRASH_DUMP? YH - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/