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-integrator/core.c | |
| parent | 2778f62056ada442414392d7ccd41188bb631619 (diff) | |
| download | talos-obmc-linux-8d717a52d1b0959128be5134dd12608e8e4f2115.tar.gz talos-obmc-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-integrator/core.c')
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index f815a1863f70..bcb26f01b26c 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -14,7 +14,7 @@ #include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/bootmem.h> +#include <linux/memblock.h> #include <linux/sched.h> #include <linux/smp.h> #include <linux/termios.h> @@ -225,5 +225,5 @@ EXPORT_SYMBOL(cm_control); */ void __init integrator_reserve(void) { - reserve_bootmem(PHYS_OFFSET, __pa(swapper_pg_dir) - PHYS_OFFSET, BOOTMEM_DEFAULT); + memblock_reserve(PHYS_OFFSET, __pa(swapper_pg_dir) - PHYS_OFFSET); } |
