diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-14 00:36:45 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-14 00:36:45 +0100 |
| commit | 7990ac9cb25d378b6311f3591f010e53a9967066 (patch) | |
| tree | ed3b073c7252ef5830a85af1bb9b0e71617c54e6 /arch/arm/kernel/setup.c | |
| parent | ARM: fix ffs/fls implementations to match x86 (diff) | |
| parent | ARM: mm: Remove bootmem code and switch to NO_BOOTMEM (diff) | |
| download | linux-7990ac9cb25d378b6311f3591f010e53a9967066.tar.xz linux-7990ac9cb25d378b6311f3591f010e53a9967066.zip | |
Merge branch 'for_3.14/arm-no-bootmem' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into devel-stable
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 987a7f5bce5f..916a8cf23328 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -817,7 +817,7 @@ static void __init reserve_crashkernel(void) if (ret) return; - ret = reserve_bootmem(crash_base, crash_size, BOOTMEM_EXCLUSIVE); + ret = memblock_reserve(crash_base, crash_size); if (ret < 0) { printk(KERN_WARNING "crashkernel reservation failed - " "memory is in use (0x%lx)\n", (unsigned long)crash_base); |