Re: [stable] [PATCH] x86_64: reserve crashkernel bootmem beforereserve dma32 bootmem
From: Greg KH
Date: Mon Jul 14 2008 - 08:08:56 EST
On Mon, Jul 14, 2008 at 09:27:22AM +0200, Ingo Molnar wrote:
> * Yinghai Lu <yhlu.kernel@xxxxxxxxx> wrote:
>
> > On Thu, Jul 10, 2008 at 10:32 AM, Yinghai Lu <yhlu.kernel@xxxxxxxxx> wrote:
> > > On Thu, Jul 10, 2008 at 5:34 AM, Joe Jin <joe.jin@xxxxxxxxxx> wrote:
> > >> Before reserve_crashkernel, dma32_reserve_bootmem would reserve 128M memory.
> > >> this cuased crashkernel end address must less than 64M or start address must
> > >> more than 192M except crashkernel memory reserved before dma32 memory reserved.
> > >>
> > >> This patch against 2.6.26-rc9
> > >>
> > >> Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
> > >> ---
> > >> setup_64.c | 4 ++--
> > >> 1 file changed, 2 insertions(+), 2 deletions(-)
> > >>
> > >> --- linux-2.6.26-rc9/arch/x86/kernel/setup_64.c.orig 2008-07-10 16:34:12.000000000 +0800
> > >> +++ linux-2.6.26-rc9/arch/x86/kernel/setup_64.c 2008-07-10 16:35:00.000000000 +0800
> > >> @@ -444,8 +444,6 @@ void __init setup_arch(char **cmdline_p)
> > >> contig_initmem_init(0, end_pfn);
> > >> #endif
> > >>
> > >> - dma32_reserve_bootmem();
> > >> -
> > >> #ifdef CONFIG_ACPI_SLEEP
> > >> /*
> > >> * Reserve low memory region for sleep support.
> > >> @@ -486,6 +484,8 @@ void __init setup_arch(char **cmdline_p)
> > >> #endif
> > >> reserve_crashkernel();
> > >>
> > >> + dma32_reserve_bootmem();
> > >> +
> > >> reserve_ibft_region();
> > >>
> > >> paging_init();
> > >
> > > Acked-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
> > >
> >
> > Ingo,
> >
> > it seems you missed this patch..., it should get into
> > 2.6.26..stable..too
>
> no, i didnt miss it - but it was too late for v2.6.26 and it was in a
> common x86 codepath and the code in -tip there is very different. The
> fix is a proper candidate for v2.6.26.1 though - stable team Cc:-ed.
>
> Acked-by: Ingo Molnar <mingo@xxxxxxx>
Hm, Yinghai, can you resend this to stable@xxxxxxxxxx so I can actually
apply it? :)
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/