diff options
author | Bernhard Walle <bwalle@suse.de> | 2007-10-19 02:40:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:50 -0400 |
commit | 5c3391f9f749023a49c64d607da4fb49263690eb (patch) | |
tree | cc64928b086d93ee7b629a4ecdd4fe819a1cce58 /arch/x86/kernel/e820_64.c | |
parent | d62cc47163ba2acad6a3c7edec7d522b9e89f0d2 (diff) |
Use extended crashkernel command line on x86_64
This patch removes the crashkernel parsing from
arch/x86_64/kernel/machine_kexec.c and calls the generic function, introduced
in the last patch, in setup_bootmem_allocator().
This is necessary because the amount of System RAM must be known in this
function now because of the new syntax.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel/e820_64.c')
-rw-r--r-- | arch/x86/kernel/e820_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c index e422b8159f69..57616865d8a0 100644 --- a/arch/x86/kernel/e820_64.c +++ b/arch/x86/kernel/e820_64.c | |||
@@ -226,7 +226,8 @@ void __init e820_reserve_resources(void) | |||
226 | request_resource(res, &code_resource); | 226 | request_resource(res, &code_resource); |
227 | request_resource(res, &data_resource); | 227 | request_resource(res, &data_resource); |
228 | #ifdef CONFIG_KEXEC | 228 | #ifdef CONFIG_KEXEC |
229 | request_resource(res, &crashk_res); | 229 | if (crashk_res.start != crashk_res.end) |
230 | request_resource(res, &crashk_res); | ||
230 | #endif | 231 | #endif |
231 | } | 232 | } |
232 | } | 233 | } |