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-u300/u300.c | |
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-u300/u300.c')
-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 @@ | |||
14 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
16 | #include <linux/ioport.h> | 16 | #include <linux/ioport.h> |
17 | #include <linux/bootmem.h> | 17 | #include <linux/memblock.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <mach/hardware.h> | 20 | #include <mach/hardware.h> |
@@ -33,7 +33,7 @@ static void __init u300_reserve(void) | |||
33 | #ifdef CONFIG_MACH_U300_SINGLE_RAM | 33 | #ifdef CONFIG_MACH_U300_SINGLE_RAM |
34 | #if ((CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1) == 1) && \ | 34 | #if ((CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1) == 1) && \ |
35 | CONFIG_MACH_U300_2MB_ALIGNMENT_FIX | 35 | CONFIG_MACH_U300_2MB_ALIGNMENT_FIX |
36 | reserve_bootmem(PHYS_OFFSET, 0x00100000, BOOTMEM_DEFAULT); | 36 | memblock_reserve(PHYS_OFFSET, 0x00100000); |
37 | #endif | 37 | #endif |
38 | #endif | 38 | #endif |
39 | } | 39 | } |