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

Commit 1221ed10 authored by Russell King's avatar Russell King
Browse files

ARM: cleanup early_paging_init() calling 



Eliminate the needless nommu version of this function, and get rid of
the proc_info_list structure argument - we no longer need this in order
to fix up the page table entries.

Acked-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
Tested-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d8dc7fbd

arch/arm/kernel/setup.c

+4 −3
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ __setup("fpe=", fpe_setup); 


extern void init_default_cache_policy(unsigned long);

extern void paging_init(const struct machine_desc *desc);

extern void early_paging_init(const struct machine_desc *,

			      struct proc_info_list *);

extern void early_paging_init(const struct machine_desc *);

extern void sanity_check_meminfo(void);

extern enum reboot_mode reboot_mode;

extern void setup_dma_zone(const struct machine_desc *desc);
@@ -936,7 +935,9 @@ void __init setup_arch(char **cmdline_p) 


	parse_early_param();



	early_paging_init(mdesc, lookup_processor_type(read_cpuid_id()));

#ifdef CONFIG_MMU

	early_paging_init(mdesc);

#endif

	setup_dma_zone(mdesc);

	sanity_check_meminfo();

	arm_memblock_init(mdesc);

arch/arm/mm/mmu.c

+2 −4
Original line number Diff line number Diff line
@@ -1396,8 +1396,7 @@ pgtables_remap lpae_pgtables_remap_asm; 
 * early_paging_init() recreates boot time page table setup, allowing machines

 * to switch over to a high (>4G) address space on LPAE systems

 */

void __init early_paging_init(const struct machine_desc *mdesc,

			      struct proc_info_list *procinfo)

void __init early_paging_init(const struct machine_desc *mdesc)

{

	pgtables_remap *lpae_pgtables_remap;

	unsigned long pa_pgd;
@@ -1465,8 +1464,7 @@ void __init early_paging_init(const struct machine_desc *mdesc, 


#else



void __init early_paging_init(const struct machine_desc *mdesc,

			      struct proc_info_list *procinfo)

void __init early_paging_init(const struct machine_desc *mdesc)

{

	long long offset;

arch/arm/mm/nommu.c

+0 −9
Original line number Diff line number Diff line
@@ -303,15 +303,6 @@ void __init sanity_check_meminfo(void) 
	memblock_set_current_limit(end);

}



/*

 * early_paging_init() recreates boot time page table setup, allowing machines

 * to switch over to a high (>4G) address space on LPAE systems

 */

void __init early_paging_init(const struct machine_desc *mdesc,

			      struct proc_info_list *procinfo)

{

}



/*

 * paging_init() sets up the page tables, initialises the zone memory

 * maps, and sets up the zero page, bad page and bad page tables.