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

Commit a5fa7b7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/platform changes from Ingo Molnar:
 "This cleans up some Xen-induced pagetable init code uglies, by
  generalizing new platform callbacks and state: x86_init.paging.*"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Document x86_init.paging.pagetable_init()
  x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done()
  x86: Move paging_init() call to x86_init.paging.pagetable_init()
  x86: Rename pagetable_setup_start() to pagetable_init()
  x86: Remove base argument from x86_init.paging.pagetable_setup_start
parents 22999300 64282278

arch/x86/include/asm/pgtable_types.h

+2 −4
Original line number Diff line number Diff line
@@ -303,11 +303,9 @@ 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_done(pgd_t *base);

extern void native_pagetable_init(void);

#else

#define native_pagetable_setup_start x86_init_pgd_noop

#define native_pagetable_setup_done  x86_init_pgd_noop

#define native_pagetable_init        paging_init

#endif



struct seq_file;

arch/x86/include/asm/x86_init.h

+5 −4
Original line number Diff line number Diff line
@@ -81,12 +81,13 @@ struct x86_init_mapping { 


/**

 * struct x86_init_paging - platform specific paging functions

 * @pagetable_setup_start:	platform specific pre paging_init() call

 * @pagetable_setup_done:	platform specific post paging_init() call

 * @pagetable_init:	platform specific paging initialization call to setup

 *			the kernel pagetables and prepare accessors functions.

 *			Callback must call paging_init(). Called once after the

 *			direct mapping for phys memory is available.

 */

struct x86_init_paging {

	void (*pagetable_setup_start)(pgd_t *base);

	void (*pagetable_setup_done)(pgd_t *base);

	void (*pagetable_init)(void);

};



/**

arch/x86/kernel/setup.c

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

#endif



	x86_init.paging.pagetable_setup_start(swapper_pg_dir);

	paging_init();

	x86_init.paging.pagetable_setup_done(swapper_pg_dir);

	x86_init.paging.pagetable_init();



	if (boot_cpu_data.cpuid_level >= 0) {

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

arch/x86/kernel/x86_init.c

+1 −3
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_noop(pgd_t *unused) { }

int __init iommu_init_noop(void) { return 0; }

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



	.paging = {

		.pagetable_setup_start	= native_pagetable_setup_start,

		.pagetable_setup_done	= native_pagetable_setup_done,

		.pagetable_init		= native_pagetable_init,

	},



	.timers = {

arch/x86/mm/init_32.c

+4 −7
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_init(void)

{

	unsigned long pfn, va;

	pgd_t *pgd;

	pgd_t *pgd, *base = swapper_pg_dir;

	pud_t *pud;

	pmd_t *pmd;

	pte_t *pte;
@@ -475,10 +475,7 @@ void __init native_pagetable_setup_start(pgd_t *base) 
		pte_clear(NULL, va, pte);

	}

	paravirt_alloc_pmd(&init_mm, __pa(base) >> PAGE_SHIFT);

}



void __init native_pagetable_setup_done(pgd_t *base)

{

	paging_init();

}



/*
@@ -493,7 +490,7 @@ void __init native_pagetable_setup_done(pgd_t *base) 
 * If we're booting paravirtualized under a hypervisor, then there are

 * more options: we may already be running PAE, and the pagetable may

 * or may not be based in swapper_pg_dir.  In any case,

 * paravirt_pagetable_setup_start() will set up swapper_pg_dir

 * paravirt_pagetable_init() will set up swapper_pg_dir

 * appropriately for the rest of the initialization to work.

 *

 * In general, pagetable_init() assumes that the pagetable may already