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

Commit 73090f89 authored by Attilio Rao's avatar Attilio Rao Committed by Thomas Gleixner
Browse files

x86: Remove base argument from x86_init.paging.pagetable_setup_start 



We either use swapper_pg_dir or the argument is unused. Preparatory
patch to simplify platform pagetable setup further.

Signed-off-by: default avatarAttilio Rao <attilio.rao@citrix.com>
Ackedb-by: default avatar <konrad.wilk@oracle.com>
Cc: <Ian.Campbell@citrix.com>
Cc: <Stefano.Stabellini@eu.citrix.com>
Cc: <xen-devel@lists.xensource.com>
Link: http://lkml.kernel.org/r/1345580561-8506-2-git-send-email-attilio.rao@citrix.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 55d512e2

arch/x86/include/asm/pgtable_types.h

+3 −3
Original line number Diff line number Diff line
@@ -303,11 +303,11 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pte); 


extern void native_pagetable_reserve(u64 start, u64 end);

#ifdef CONFIG_X86_32

extern void native_pagetable_setup_start(pgd_t *base);

extern void native_pagetable_setup_start(void);

extern void native_pagetable_setup_done(pgd_t *base);

#else

#define native_pagetable_setup_start x86_init_pgd_noop

#define native_pagetable_setup_done  x86_init_pgd_noop

#define native_pagetable_setup_start x86_init_pgd_start_noop

#define native_pagetable_setup_done  x86_init_pgd_done_noop

#endif



struct seq_file;

arch/x86/include/asm/x86_init.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct x86_init_mapping { 
 * @pagetable_setup_done:	platform specific post paging_init() call

 */

struct x86_init_paging {

	void (*pagetable_setup_start)(pgd_t *base);

	void (*pagetable_setup_start)(void);

	void (*pagetable_setup_done)(pgd_t *base);

};

arch/x86/kernel/setup.c

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

#endif



	x86_init.paging.pagetable_setup_start(swapper_pg_dir);

	x86_init.paging.pagetable_setup_start();

	paging_init();

	x86_init.paging.pagetable_setup_done(swapper_pg_dir);

arch/x86/kernel/x86_init.c

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 


void __cpuinit x86_init_noop(void) { }

void __init x86_init_uint_noop(unsigned int unused) { }

void __init x86_init_pgd_noop(pgd_t *unused) { }

void __init x86_init_pgd_start_noop(void) { }

void __init x86_init_pgd_done_noop(pgd_t *unused) { }

int __init iommu_init_noop(void) { return 0; }

void iommu_shutdown_noop(void) { }

arch/x86/mm/init_32.c

+2 −2
Original line number Diff line number Diff line
@@ -445,10 +445,10 @@ static inline void permanent_kmaps_init(pgd_t *pgd_base) 
}

#endif /* CONFIG_HIGHMEM */



void __init native_pagetable_setup_start(pgd_t *base)

void __init native_pagetable_setup_start(void)

{

	unsigned long pfn, va;

	pgd_t *pgd;

	pgd_t *pgd, *base = swapper_pg_dir;

	pud_t *pud;

	pmd_t *pmd;

	pte_t *pte;