diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-21 22:26:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-21 22:26:51 +0100 |
| commit | 857989a7fdd2f6de42272578b8aaa413ed6e63e4 (patch) | |
| tree | 21c941d63000fdaa0ea32d34087b53d41b5919f8 /arch/arm/kernel | |
| parent | Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for... (diff) | |
| parent | Merge branch 'for_3.14/arm-no-bootmem' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | linux-857989a7fdd2f6de42272578b8aaa413ed6e63e4.tar.xz linux-857989a7fdd2f6de42272578b8aaa413ed6e63e4.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/kernel')
| -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 061cea820e3f..a4729c6be25d 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -831,7 +831,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) { pr_warn("crashkernel reservation failed - memory is in use (0x%lx)\n", (unsigned long)crash_base); |