diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 14:47:18 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 03:48:23 -0400 |
| commit | 8d717a52d1b0959128be5134dd12608e8e4f2115 (patch) | |
| tree | 6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6 /arch/arm/mach-clps711x | |
| parent | 2778f62056ada442414392d7ccd41188bb631619 (diff) | |
ARM: Convert platform reservations to use LMB rather than bootmem
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-clps711x')
| -rw-r--r-- | arch/arm/mach-clps711x/edb7211-arch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c index 077f4051a06a..4a7a2322979a 100644 --- a/arch/arm/mach-clps711x/edb7211-arch.c +++ b/arch/arm/mach-clps711x/edb7211-arch.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
| 24 | 24 | ||
| @@ -33,7 +33,7 @@ extern void edb7211_map_io(void); | |||
| 33 | /* Reserve screen memory region at the start of main system memory. */ | 33 | /* Reserve screen memory region at the start of main system memory. */ |
| 34 | static void __init edb7211_reserve(void) | 34 | static void __init edb7211_reserve(void) |
| 35 | { | 35 | { |
| 36 | reserve_bootmem(PHYS_OFFSET, 0x00020000, BOOTMEM_DEFAULT); | 36 | memblock_reserve(PHYS_OFFSET, 0x00020000); |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | static void __init | 39 | static void __init |