commit 8d717a52d1b0959128be5134dd12608e8e4f2115
author Russell King <rmk+kernel@arm.linux.org.uk> Sat May 22 19:47:18 2010 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Tue Jul 27 08:48:23 2010 +0100
tree 6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6
parent 2778f62056ada442414392d7ccd41188bb631619

ARM: Convert platform reservations to use LMB rather than bootmem

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-s3c2440/mach-rx1950.c

diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c
index f26d5d6..142d1f9 100644
--- a/arch/arm/mach-s3c2440/mach-rx1950.c
+++ b/arch/arm/mach-s3c2440/mach-rx1950.c
@@ -15,7 +15,7 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/init.h>
@@ -574,8 +574,8 @@
 /* H1940 and RX3715 need to reserve this for suspend */
 static void __init rx1950_reserve(void)
 {
-	reserve_bootmem(0x30003000, 0x1000, BOOTMEM_DEFAULT);
-	reserve_bootmem(0x30081000, 0x1000, BOOTMEM_DEFAULT);
+	memblock_reserve(0x30003000, 0x1000);
+	memblock_reserve(0x30081000, 0x1000);
 }
 
 MACHINE_START(RX1950, "HP iPAQ RX1950")