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-u300/u300.c

diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c
index 178dca4..bfcda98 100644
--- a/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@ -14,7 +14,7 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <mach/hardware.h>
@@ -33,7 +33,7 @@
 #ifdef CONFIG_MACH_U300_SINGLE_RAM
 #if ((CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1) == 1) && \
 	CONFIG_MACH_U300_2MB_ALIGNMENT_FIX
-        reserve_bootmem(PHYS_OFFSET, 0x00100000, BOOTMEM_DEFAULT);
+        memblock_reserve(PHYS_OFFSET, 0x00100000);
 #endif
 #endif
 }