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

Commit 030cb6c0 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Move paravirt pagetable_setup to x86_init_ops 



Replace more paravirt hackery by proper x86_init_ops.

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

arch/x86/include/asm/paravirt.h

+0 −10
Original line number Diff line number Diff line
@@ -351,16 +351,6 @@ static inline void paravirt_post_allocator_init(void) 
		(*pv_init_ops.post_allocator_init)();

}



static inline void paravirt_pagetable_setup_start(pgd_t *base)

{

	(*pv_mmu_ops.pagetable_setup_start)(base);

}



static inline void paravirt_pagetable_setup_done(pgd_t *base)

{

	(*pv_mmu_ops.pagetable_setup_done)(base);

}



#ifdef CONFIG_SMP

static inline void startup_ipi_hook(int phys_apicid, unsigned long start_eip,

				    unsigned long start_esp)

arch/x86/include/asm/paravirt_types.h

+0 −9
Original line number Diff line number Diff line
@@ -231,15 +231,6 @@ struct pv_apic_ops { 
};



struct pv_mmu_ops {

	/*

	 * Called before/after init_mm pagetable setup. setup_start

	 * may reset %cr3, and may pre-install parts of the pagetable;

	 * pagetable setup is expected to preserve any existing

	 * mapping.

	 */

	void (*pagetable_setup_start)(pgd_t *pgd_base);

	void (*pagetable_setup_done)(pgd_t *pgd_base);



	unsigned long (*read_cr2)(void);

	void (*write_cr2)(unsigned long);

arch/x86/include/asm/pgtable.h

+0 −10
Original line number Diff line number Diff line
@@ -56,16 +56,6 @@ extern struct list_head pgd_list; 
#define pte_update(mm, addr, ptep)              do { } while (0)

#define pte_update_defer(mm, addr, ptep)        do { } while (0)



static inline void __init paravirt_pagetable_setup_start(pgd_t *base)

{

	native_pagetable_setup_start(base);

}



static inline void __init paravirt_pagetable_setup_done(pgd_t *base)

{

	native_pagetable_setup_done(base);

}



#define pgd_val(x)	native_pgd_val(x)

#define __pgd(x)	native_make_pgd(x)

arch/x86/include/asm/pgtable_types.h

+2 −2
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pte); 
extern void native_pagetable_setup_start(pgd_t *base);

extern void native_pagetable_setup_done(pgd_t *base);

#else

static inline void native_pagetable_setup_start(pgd_t *base) {}

static inline void native_pagetable_setup_done(pgd_t *base) {}

#define native_pagetable_setup_start x86_init_pgd_noop

#define native_pagetable_setup_done  x86_init_pgd_noop

#endif



struct seq_file;

arch/x86/include/asm/x86_init.h

+13 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PLATFORM_H

#define _ASM_X86_PLATFORM_H



#include <asm/pgtable_types.h>



struct mpc_bus;

struct mpc_cpu;

struct mpc_table;
@@ -66,6 +68,16 @@ struct x86_init_oem { 
	void (*banner)(void);

};



/**

 * 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

 */

struct x86_init_paging {

	void (*pagetable_setup_start)(pgd_t *base);

	void (*pagetable_setup_done)(pgd_t *base);

};



/**

 * struct x86_init_ops - functions for platform specific setup

 *
@@ -75,6 +87,7 @@ struct x86_init_ops { 
	struct x86_init_mpparse		mpparse;

	struct x86_init_irqs		irqs;

	struct x86_init_oem		oem;

	struct x86_init_paging		paging;

};



extern struct x86_init_ops x86_init;