Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757105AbYFVUXU (ORCPT ); Sun, 22 Jun 2008 16:23:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754015AbYFVUXM (ORCPT ); Sun, 22 Jun 2008 16:23:12 -0400 Received: from saeurebad.de ([85.214.36.134]:58317 "EHLO saeurebad.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753662AbYFVUXL (ORCPT ); Sun, 22 Jun 2008 16:23:11 -0400 From: Johannes Weiner To: Greg KH Cc: linux-kernel@vger.kernel.org, stable@kernel.org, Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Bernhard Walle , Ingo Molnar Subject: Re: [patch 4/5] x86: use BOOTMEM_EXCLUSIVE on 32-bit References: <20080622185327.348377223@mini.kroah.org> <20080622190131.GB20141@suse.de> Date: Sun, 22 Jun 2008 22:22:58 +0200 In-Reply-To: <20080622190131.GB20141@suse.de> (Greg KH's message of "Sun, 22 Jun 2008 12:01:31 -0700") Message-ID: <87prq9dxst.fsf@skyscraper.fehenstaub.lan> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.1.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1626 Lines: 49 Hi, Greg KH writes: > 2.6.25-stable review patch. If anyone has any objections, please let us > know. > > ------------------ > From: Bernhard Walle > > commit d3942cff620bea073fc4e3c8ed878eb1e84615ce upstream > > This patch uses the BOOTMEM_EXCLUSIVE for crashkernel reservation also for > i386 and prints a error message on failure. > > The patch is still for 2.6.26 since it is only bug fixing. The unification > of reserve_crashkernel() between i386 and x86_64 should be done for 2.6.27. > > Signed-off-by: Bernhard Walle > Signed-off-by: Ingo Molnar > Signed-off-by: Greg Kroah-Hartman > > --- > arch/x86/kernel/setup_32.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > --- a/arch/x86/kernel/setup_32.c > +++ b/arch/x86/kernel/setup_32.c > @@ -483,10 +483,16 @@ static void __init reserve_crashkernel(v > (unsigned long)(crash_size >> 20), > (unsigned long)(crash_base >> 20), > (unsigned long)(total_mem >> 20)); > + > + if (reserve_bootmem(crash_base, crash_size, > + BOOTMEM_EXCLUSIVE) < 0) { > + printk(KERN_INFO "crashkernel reservation " > + "failed - memory is in use\n"); > + return; > + } You will also need the patch from http://lkml.org/lkml/2008/6/21/103 to make sure reserve_bootmem() is not void (*)(). Hannes -- 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/