diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 20:47:18 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 09:48:23 +0200 |
| commit | 8d717a52d1b0959128be5134dd12608e8e4f2115 (patch) | |
| tree | 6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6 /arch/arm/mach-u300 | |
| parent | ARM: initial LMB trial (diff) | |
| download | linux-8d717a52d1b0959128be5134dd12608e8e4f2115.tar.xz linux-8d717a52d1b0959128be5134dd12608e8e4f2115.zip | |
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-u300')
| -rw-r--r-- | arch/arm/mach-u300/u300.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c index 178dca4f9555..bfcda9820888 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 @@ static void __init u300_reserve(void) #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 } |