diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 19:47:18 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 08:48:23 +0100 |
commit | 8d717a52d1b0959128be5134dd12608e8e4f2115 (patch) | |
tree | 6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6 /arch/arm/mach-s3c2410 | |
parent | 2778f62056ada442414392d7ccd41188bb631619 (diff) | |
download | linux-8d717a52d1b0959128be5134dd12608e8e4f2115.tar.gz linux-8d717a52d1b0959128be5134dd12608e8e4f2115.tar.bz2 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-s3c2410')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 2407aab4d1b8..3ba3bab139d0 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.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/sysdev.h> @@ -308,8 +308,8 @@ static void __init h1940_map_io(void) /* H1940 and RX3715 need to reserve this for suspend */ static void __init h1940_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 h1940_init_irq(void) |