2008-07-14 17:17:28

by Yinghai Lu

Subject: [PATCH] x86_64: reserve crashkernel bootmem before reserve dma32 bootmem

From: Joe Jin <[email protected]>

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.

Signed-off-by: Joe Jin <[email protected]>
Acked-by: Yinghai Lu <[email protected]>
Acked-by: Ingo Molnar <[email protected]>


---
arch/x86/kernel/setup_64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/x86/kernel/setup_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_64.c
+++ linux-2.6/arch/x86/kernel/setup_64.c
@@ -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();

2008-07-15 00:29:59

by Joe Jin

Subject: Re: [PATCH] x86_64: reserve crashkernel bootmem before reserve dma32 bootmem

Yinghai, thanks!


On 2008-07-14 10:16, Yinghai Lu wrote:
> From: Joe Jin <[email protected]>
>
> 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.
>
> Signed-off-by: Joe Jin <[email protected]>
> Acked-by: Yinghai Lu <[email protected]>
> Acked-by: Ingo Molnar <[email protected]>
>
>
> ---
> arch/x86/kernel/setup_64.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/arch/x86/kernel/setup_64.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/setup_64.c
> +++ linux-2.6/arch/x86/kernel/setup_64.c
> @@ -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();