ARM: Convert platform reservations to use LMB rather than bootmem

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

2 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c
index f26d5d60c13d..142d1f921176 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 @@ static void __init rx1950_init_machine(void)
 /* 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")
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index 6ebdb7bcf085..6bb44f75a9ce 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.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/timer.h>
 #include <linux/init.h>
 #include <linux/tty.h>
@@ -195,8 +195,8 @@ static void __init rx3715_map_io(void)
 /* H1940 and RX3715 need to reserve this for suspend */
 static void __init rx3715_reserve(void)
 {
-        reserve_bootmem(0x30003000, 0x1000, BOOTMEM_DEFAULT);
-        reserve_bootmem(0x30081000, 0x1000, BOOTMEM_DEFAULT);
+        memblock_reserve(0x30003000, 0x1000);
+        memblock_reserve(0x30081000, 0x1000);
 }
 
 static void __init rx3715_init_irq(void)