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

Commit f6757908 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: Remove memory hole scanning"

parents 339d5c0b 07eb9396

arch/arm/include/asm/mach/arch.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct machine_desc { 
					 struct meminfo *);

	void			(*reserve)(void);/* reserve mem blocks	*/

	void			(*map_io)(void);/* IO mapping function	*/

	void			(*init_very_early)(void);

	void			(*init_early)(void);

	void			(*init_irq)(void);

	void			(*init_time)(void);

arch/arm/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -789,9 +789,6 @@ void __init setup_arch(char **cmdline_p) 


	parse_early_param();



	if (mdesc->init_very_early)

		mdesc->init_very_early();



	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);

	sanity_check_meminfo();

	arm_memblock_init(&meminfo, mdesc);

arch/arm/mach-msm/board-8084.c

+0 −11
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ void __init apq8084_reserve(void) 
	of_scan_flat_dt(dt_scan_for_memory_reserve, NULL);

}



static void __init apq8084_early_memory(void)

{

	of_scan_flat_dt(dt_scan_for_memory_hole, NULL);

}



/*

 * Used to satisfy dependencies for devices that need to be

 * run early or in a particular order. Most likely your device doesn't fall
@@ -103,11 +98,6 @@ void __init apq8084_init(void) 
	apq8084_add_drivers();

}



void __init apq8084_init_very_early(void)

{

	apq8084_early_memory();

}



static const char *apq8084_dt_match[] __initconst = {

	"qcom,apq8084",

	NULL
@@ -119,6 +109,5 @@ DT_MACHINE_START(APQ8084_DT, 
	.init_machine		= apq8084_init,

	.dt_compat		= apq8084_dt_match,

	.reserve		= apq8084_reserve,

	.init_very_early	= apq8084_init_very_early,

	.smp			= &msm8974_smp_ops,

MACHINE_END

arch/arm/mach-msm/board-8092.c

+0 −6
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ 


static const char mac_addr_prop_name[] = "mac-address";



static void __init mpq8092_early_memory(void)

{

	of_scan_flat_dt(dt_scan_for_memory_hole, NULL);

}



static void __init mpq8092_dt_reserve(void)

{

	of_scan_flat_dt(dt_scan_for_memory_reserve, NULL);
@@ -188,6 +183,5 @@ DT_MACHINE_START(MSM8092_DT, 
	.init_machine		= mpq8092_init,

	.dt_compat		= mpq8092_dt_match,

	.reserve		= mpq8092_dt_reserve,

	.init_very_early	= mpq8092_early_memory,

	.smp			= &msm8974_smp_ops,

MACHINE_END

arch/arm/mach-msm/board-8226.c

+0 −6
Original line number Diff line number Diff line
@@ -71,11 +71,6 @@ static struct of_dev_auxdata msm8226_auxdata_lookup[] __initdata = { 
	{}

};



static void __init msm8226_early_memory(void)

{

	of_scan_flat_dt(dt_scan_for_memory_hole, NULL);

}



static void __init msm8226_reserve(void)

{

	of_scan_flat_dt(dt_scan_for_memory_reserve, NULL);
@@ -141,6 +136,5 @@ DT_MACHINE_START(MSM8226_DT, 
	.init_machine		= msm8226_init,

	.dt_compat		= msm8226_dt_match,

	.reserve		= msm8226_reserve,

	.init_very_early	= msm8226_early_memory,

	.smp			= &arm_smp_ops,

MACHINE_END