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/machine_kexec_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/machine_kexec_64.c')
-rw-r--r-- | arch/x86/kernel/machine_kexec_64.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 7450b69710b5..0d8577f05422 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c | |||
@@ -231,33 +231,6 @@ NORET_TYPE void machine_kexec(struct kimage *image) | |||
231 | image->start); | 231 | image->start); |
232 | } | 232 | } |
233 | 233 | ||
234 | /* crashkernel=size@addr specifies the location to reserve for | ||
235 | * a crash kernel. By reserving this memory we guarantee | ||
236 | * that linux never set's it up as a DMA target. | ||
237 | * Useful for holding code to do something appropriate | ||
238 | * after a kernel panic. | ||
239 | */ | ||
240 | static int __init setup_crashkernel(char *arg) | ||
241 | { | ||
242 | unsigned long size, base; | ||
243 | char *p; | ||
244 | if (!arg) | ||
245 | return -EINVAL; | ||
246 | size = memparse(arg, &p); | ||
247 | if (arg == p) | ||
248 | return -EINVAL; | ||
249 | if (*p == '@') { | ||
250 | base = memparse(p+1, &p); | ||
251 | /* FIXME: Do I want a sanity check to validate the | ||
252 | * memory range? Yes you do, but it's too early for | ||
253 | * e820 -AK */ | ||
254 | crashk_res.start = base; | ||
255 | crashk_res.end = base + size - 1; | ||
256 | } | ||
257 | return 0; | ||
258 | } | ||
259 | early_param("crashkernel", setup_crashkernel); | ||
260 | |||
261 | void arch_crash_save_vmcoreinfo(void) | 234 | void arch_crash_save_vmcoreinfo(void) |
262 | { | 235 | { |
263 | #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE | 236 | #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE |