Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d717a52 authored by Russell King's avatar Russell King
Browse files

ARM: Convert platform reservations to use LMB rather than bootmem 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2778f620

arch/arm/include/asm/memblock.h

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ extern phys_addr_t lowmem_end_addr; 
#endif



struct meminfo;

struct machine_desc;



extern void arm_memblock_init(struct meminfo *);

extern void arm_memblock_init(struct meminfo *, struct machine_desc *);



#endif

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ void __init setup_arch(char **cmdline_p) 


	parse_early_param();



	arm_memblock_init(&meminfo);

	arm_memblock_init(&meminfo, mdesc);



	paging_init(mdesc);

	request_standard_resources(&meminfo, mdesc);

arch/arm/mach-clps711x/edb7211-arch.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#include <linux/init.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/types.h>

#include <linux/string.h>
@@ -33,7 +33,7 @@ extern void edb7211_map_io(void); 
/* Reserve screen memory region at the start of main system memory. */

static void __init edb7211_reserve(void)

{

	reserve_bootmem(PHYS_OFFSET, 0x00020000, BOOTMEM_DEFAULT);

	memblock_reserve(PHYS_OFFSET, 0x00020000);

}



static void __init

arch/arm/mach-integrator/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-pxa/palmt5.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/irq.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/pda_power.h>

#include <linux/pwm_backlight.h>

#include <linux/gpio.h>
@@ -399,7 +399,7 @@ static void __init palmt5_udc_init(void) 


static void __init palmt5_reserve(void)

{

	reserve_bootmem(0xa0200000, 0x1000, BOOTMEM_EXCLUSIVE);

	memblock_reserve(0xa0200000, 0x1000);

}



static void __init palmt5_init(void)