aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAmul Shah <amul.shah@unisys.com>2006-06-25 08:49:31 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:26 -0400
commit00212fef814612245ed0261cbac8426d0c9a31a5 (patch)
treea9316376451808f6a3bc8158abcc8906ce6d406f /arch
parentcc13ad6217018833e590a0e2ef5937aa16162d34 (diff)
[PATCH] Fix kdump Crash Kernel boot memory reservation for NUMA machines
This patch will fix a boot memory reservation bug that trashes memory on the ES7000 when loading the kdump crash kernel. The code in arch/x86_64/kernel/setup.c to reserve boot memory for the crash kernel uses the non-numa aware "reserve_bootmem" function instead of the NUMA aware "reserve_bootmem_generic". I checked to make sure that no other function was using "reserve_bootmem" and found none, except the ones that had NUMA ifdef'ed out. I have tested this patch only on an ES7000 with NUMA on and off (numa=off) in a single (non-NUMA) and multi-cell (NUMA) configurations. Signed-off-by: Amul Shah <amul.shah@unisys.com> Looks-good-to: Vivek Goyal <vgoyal@in.ibm.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index b8d5116d7371..fdb82658b1a1 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -823,7 +823,7 @@ void __init setup_arch(char **cmdline_p)
823#endif 823#endif
824#ifdef CONFIG_KEXEC 824#ifdef CONFIG_KEXEC
825 if (crashk_res.start != crashk_res.end) { 825 if (crashk_res.start != crashk_res.end) {
826 reserve_bootmem(crashk_res.start, 826 reserve_bootmem_generic(crashk_res.start,
827 crashk_res.end - crashk_res.start + 1); 827 crashk_res.end - crashk_res.start + 1);
828 } 828 }
829#endif 829#endif