Messages in this thread | | | Date | Sun, 22 Jun 2008 13:30:47 -0700 | From | Greg KH <> | Subject | Re: [patch 4/5] x86: use BOOTMEM_EXCLUSIVE on 32-bit |
| |
On Sun, Jun 22, 2008 at 10:22:58PM +0200, Johannes Weiner wrote: > Hi, > > Greg KH <gregkh@suse.de> writes: > > > 2.6.25-stable review patch. If anyone has any objections, please let us > > know. > > > > ------------------ > > From: Bernhard Walle <bwalle@suse.de> > > > > 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 <bwalle@suse.de> > > Signed-off-by: Ingo Molnar <mingo@elte.hu> > > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> > > > > --- > > 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 (*)().
Ok, let me know when that goes into Linus's tree please.
thanks,
greg k-h
| |