summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/e820_32.c
diff options
context:
space:
mode:
authorBernhard Walle <bwalle@suse.de>2007-10-19 06:40:59 (GMT)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 18:53:49 (GMT)
commitd62cc47163ba2acad6a3c7edec7d522b9e89f0d2 (patch)
treea391a8e3f217ecf1bd1084157b584a86c332ff04 /arch/x86/kernel/e820_32.c
parentcba63c3089fe57bfafff56239a67ac26bfe027a0 (diff)
downloadlinux-fsl-qoriq-d62cc47163ba2acad6a3c7edec7d522b9e89f0d2.tar.xz
Use extended crashkernel command line on i386
This patch removes the crashkernel parsing from arch/i386/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_32.c')
-rw-r--r--arch/x86/kernel/e820_32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
index 3c86b97..d58039e 100644
--- a/arch/x86/kernel/e820_32.c
+++ b/arch/x86/kernel/e820_32.c
@@ -288,7 +288,8 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
request_resource(res, code_resource);
request_resource(res, data_resource);
#ifdef CONFIG_KEXEC
- request_resource(res, &crashk_res);
+ if (crashk_res.start != crashk_res.end)
+ request_resource(res, &crashk_res);
#endif
}
}