summaryrefslogtreecommitdiff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-01-21 21:26:51 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-01-21 21:26:51 (GMT)
commit857989a7fdd2f6de42272578b8aaa413ed6e63e4 (patch)
tree21c941d63000fdaa0ea32d34087b53d41b5919f8 /arch/arm/kernel
parent6f14d778c15fe08b6d98e759cf7e3893ed67b238 (diff)
parent7990ac9cb25d378b6311f3591f010e53a9967066 (diff)
downloadlinux-857989a7fdd2f6de42272578b8aaa413ed6e63e4.tar.xz
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 061cea8..a4729c6 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);