From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 28 Jul 2008 15:19:02 +0000 (+0200)
Subject: Merge branch 'x86/crashdump' into x86/urgent
X-Git-Tag: v2.6.27-rc2~112^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ce37a58e334ef773f88283939afc9f4965c7697;hp=d7ba11d01cfedf63b50391fbe4a05274b6992b43;p=linux-2.6

Merge branch 'x86/crashdump' into x86/urgent
---

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index b520dae02b..2d88858638 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