diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 12:14:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 12:14:26 +0100 |
| commit | 45aa0663cc408617b79a2b53f0a5f50e94688a48 (patch) | |
| tree | 0a53931c317c3c72a3555bd2fbb70a881ee870f2 /arch/powerpc/kernel/machine_kexec.c | |
| parent | 511585a28e5b5fd1cac61e601e42efc4c5dd64b5 (diff) | |
| parent | 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 (diff) | |
| download | op-kernel-dev-45aa0663cc408617b79a2b53f0a5f50e94688a48.zip op-kernel-dev-45aa0663cc408617b79a2b53f0a5f50e94688a48.tar.gz | |
Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock
Diffstat (limited to 'arch/powerpc/kernel/machine_kexec.c')
| -rw-r--r-- | arch/powerpc/kernel/machine_kexec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c index 9ce1672..a2158a3 100644 --- a/arch/powerpc/kernel/machine_kexec.c +++ b/arch/powerpc/kernel/machine_kexec.c @@ -107,9 +107,6 @@ void __init reserve_crashkernel(void) unsigned long long crash_size, crash_base; int ret; - /* this is necessary because of memblock_phys_mem_size() */ - memblock_analyze(); - /* use common parsing */ ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base); |
