hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Santosh Shilimkar <ssantosh@kernel.org>
Tested-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2015-04-04 17:25:20 +01:00
parent d8dc7fbd53
commit 1221ed10f2
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/kernel/setup.c
View File

@ -75,8 +75,7 @@ __setup("fpe=", fpe_setup);
extern void init_default_cache_policy(unsigned long); extern void init_default_cache_policy(unsigned long);
extern void paging_init(const struct machine_desc *desc); extern void paging_init(const struct machine_desc *desc);
extern void early_paging_init(const struct machine_desc *, extern void early_paging_init(const struct machine_desc *);
struct proc_info_list *);
extern void sanity_check_meminfo(void); extern void sanity_check_meminfo(void);
extern enum reboot_mode reboot_mode; extern enum reboot_mode reboot_mode;
extern void setup_dma_zone(const struct machine_desc *desc); extern void setup_dma_zone(const struct machine_desc *desc);
@ -936,7 +935,9 @@ void __init setup_arch(char **cmdline_p)
parse_early_param(); 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); setup_dma_zone(mdesc);
sanity_check_meminfo(); sanity_check_meminfo();
arm_memblock_init(mdesc); arm_memblock_init(mdesc);

6
arch/arm/mm/mmu.c
View File

@ -1396,8 +1396,7 @@ pgtables_remap lpae_pgtables_remap_asm;
* early_paging_init() recreates boot time page table setup, allowing machines * early_paging_init() recreates boot time page table setup, allowing machines
* to switch over to a high (>4G) address space on LPAE systems * to switch over to a high (>4G) address space on LPAE systems
*/ */
void __init early_paging_init(const struct machine_desc *mdesc, void __init early_paging_init(const struct machine_desc *mdesc)
struct proc_info_list *procinfo)
{ {
pgtables_remap *lpae_pgtables_remap; pgtables_remap *lpae_pgtables_remap;
unsigned long pa_pgd; unsigned long pa_pgd;
@ -1465,8 +1464,7 @@ void __init early_paging_init(const struct machine_desc *mdesc,
#else #else
void __init early_paging_init(const struct machine_desc *mdesc, void __init early_paging_init(const struct machine_desc *mdesc)
struct proc_info_list *procinfo)
{ {
long long offset; long long offset;

9
arch/arm/mm/nommu.c
View File

@ -303,15 +303,6 @@ void __init sanity_check_meminfo(void)
memblock_set_current_limit(end); 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 * paging_init() sets up the page tables, initialises the zone memory
* maps, and sets up the zero page, bad page and bad page tables. * maps, and sets up the zero page, bad page and bad page tables.