diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:19:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:19:02 +0200 |
| commit | 6ce37a58e334ef773f88283939afc9f4965c7697 (patch) | |
| tree | 515d9b236a5952be5467775b58c556336cc75cab /arch | |
| parent | d7ba11d01cfedf63b50391fbe4a05274b6992b43 (diff) | |
| parent | 91467bdf6e53058af13fd255375d6634ba0c70e0 (diff) | |
| download | linux-6ce37a58e334ef773f88283939afc9f4965c7697.tar.gz linux-6ce37a58e334ef773f88283939afc9f4965c7697.tar.bz2 linux-6ce37a58e334ef773f88283939afc9f4965c7697.zip | |
Merge branch 'x86/crashdump' into x86/urgent
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/setup.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index b520dae02bf4..2d888586385d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -788,10 +788,6 @@ void __init setup_arch(char **cmdline_p) initmem_init(0, max_pfn); -#ifdef CONFIG_X86_64 - dma32_reserve_bootmem(); -#endif - #ifdef CONFIG_ACPI_SLEEP /* * Reserve low memory region for sleep support. @@ -806,6 +802,15 @@ void __init setup_arch(char **cmdline_p) #endif reserve_crashkernel(); +#ifdef CONFIG_X86_64 + /* + * dma32_reserve_bootmem() allocates bootmem which may conflict + * with the crashkernel command line, so do that after + * reserve_crashkernel() + */ + dma32_reserve_bootmem(); +#endif + reserve_ibft_region(); #ifdef CONFIG_KVM_CLOCK |