From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 21 Jan 2014 21:26:51 +0000 (+0000)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=857989a7fdd2f6de42272578b8aaa413ed6e63e4;p=linux-beck.git

Merge branch 'devel-stable' into for-next
---

857989a7fdd2f6de42272578b8aaa413ed6e63e4
diff --cc arch/arm/kernel/setup.c
index 061cea820e3f,916a8cf23328..a4729c6be25d
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -831,10 -817,10 +831,10 @@@ static void __init reserve_crashkernel(
  	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);
 +		pr_warn("crashkernel reservation failed - memory is in use (0x%lx)\n",
 +			(unsigned long)crash_base);
  		return;
  	}