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

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

x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done() 



At this stage x86_init.paging.pagetable_setup_done is only used in the
XEN case. Move its content in the x86_init.paging.pagetable_init setup
function and remove the now unused x86_init.paging.pagetable_setup_done
remaining infrastructure.

Signed-off-by: default avatarAttilio Rao <attilio.rao@citrix.com>
Acked-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-5-git-send-email-attilio.rao@citrix.com


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

arch/x86/include/asm/pgtable_types.h

+0 −2
Original line number Diff line number Diff line
@@ -304,10 +304,8 @@ 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_init(void);

extern void native_pagetable_setup_done(pgd_t *base);

#else

#define native_pagetable_init        paging_init

#define native_pagetable_setup_done  x86_init_pgd_done_noop

#endif



struct seq_file;

arch/x86/include/asm/x86_init.h

+0 −2
Original line number Diff line number Diff line
@@ -82,11 +82,9 @@ struct x86_init_mapping { 
/**

 * struct x86_init_paging - platform specific paging functions

 * @pagetable_init:		platform specific paging initialization call

 * @pagetable_setup_done:	platform specific post paging_init() call

 */

struct x86_init_paging {

	void (*pagetable_init)(void);

	void (*pagetable_setup_done)(pgd_t *base);

};



/**

arch/x86/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -962,7 +962,6 @@ void __init setup_arch(char **cmdline_p) 
#endif



	x86_init.paging.pagetable_init();

	x86_init.paging.pagetable_setup_done(swapper_pg_dir);



	if (boot_cpu_data.cpuid_level >= 0) {

		/* A CPU has %cr4 if and only if it has CPUID */

arch/x86/kernel/x86_init.c

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


void __cpuinit x86_init_noop(void) { }

void __init x86_init_uint_noop(unsigned int unused) { }

void __init x86_init_pgd_done_noop(pgd_t *unused) { }

int __init iommu_init_noop(void) { return 0; }

void iommu_shutdown_noop(void) { }
@@ -69,7 +68,6 @@ struct x86_init_ops x86_init __initdata = { 


	.paging = {

		.pagetable_init		= native_pagetable_init,

		.pagetable_setup_done	= native_pagetable_setup_done,

	},



	.timers = {

arch/x86/mm/init_32.c

+0 −4
Original line number Diff line number Diff line
@@ -478,10 +478,6 @@ void __init native_pagetable_init(void) 
	paging_init();

}



void __init native_pagetable_setup_done(pgd_t *base)

{

}



/*

 * Build a proper pagetable for the kernel mappings.  Up until this

 * point, we've been running on some set of pagetables constructed by