mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 12:14:06 +00:00
x86: Rename pagetable_setup_start() to pagetable_init()
In preparation for unifying the pagetable_setup_start() and pagetable_setup_done() setup functions, rename appropriately all the infrastructure related to pagetable_setup_start(). Signed-off-by: Attilio Rao <attilio.rao@citrix.com> Ackedd-by: <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-3-git-send-email-attilio.rao@citrix.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
73090f8993
commit
7737b215ad
6 changed files with 11 additions and 11 deletions
|
@ -303,10 +303,10 @@ 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(void);
|
||||
extern void native_pagetable_init(void);
|
||||
extern void native_pagetable_setup_done(pgd_t *base);
|
||||
#else
|
||||
#define native_pagetable_setup_start x86_init_pgd_start_noop
|
||||
#define native_pagetable_init x86_init_pgd_init_noop
|
||||
#define native_pagetable_setup_done x86_init_pgd_done_noop
|
||||
#endif
|
||||
|
||||
|
|
|
@ -81,11 +81,11 @@ struct x86_init_mapping {
|
|||
|
||||
/**
|
||||
* struct x86_init_paging - platform specific paging functions
|
||||
* @pagetable_setup_start: platform specific pre paging_init() call
|
||||
* @pagetable_init: platform specific paging initialization call
|
||||
* @pagetable_setup_done: platform specific post paging_init() call
|
||||
*/
|
||||
struct x86_init_paging {
|
||||
void (*pagetable_setup_start)(void);
|
||||
void (*pagetable_init)(void);
|
||||
void (*pagetable_setup_done)(pgd_t *base);
|
||||
};
|
||||
|
||||
|
|
|
@ -961,7 +961,7 @@ void __init setup_arch(char **cmdline_p)
|
|||
kvmclock_init();
|
||||
#endif
|
||||
|
||||
x86_init.paging.pagetable_setup_start();
|
||||
x86_init.paging.pagetable_init();
|
||||
paging_init();
|
||||
x86_init.paging.pagetable_setup_done(swapper_pg_dir);
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
void __cpuinit x86_init_noop(void) { }
|
||||
void __init x86_init_uint_noop(unsigned int unused) { }
|
||||
void __init x86_init_pgd_start_noop(void) { }
|
||||
void __init x86_init_pgd_init_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) { }
|
||||
|
@ -69,7 +69,7 @@ struct x86_init_ops x86_init __initdata = {
|
|||
},
|
||||
|
||||
.paging = {
|
||||
.pagetable_setup_start = native_pagetable_setup_start,
|
||||
.pagetable_init = native_pagetable_init,
|
||||
.pagetable_setup_done = native_pagetable_setup_done,
|
||||
},
|
||||
|
||||
|
|
|
@ -445,7 +445,7 @@ static inline void permanent_kmaps_init(pgd_t *pgd_base)
|
|||
}
|
||||
#endif /* CONFIG_HIGHMEM */
|
||||
|
||||
void __init native_pagetable_setup_start(void)
|
||||
void __init native_pagetable_init(void)
|
||||
{
|
||||
unsigned long pfn, va;
|
||||
pgd_t *pgd, *base = swapper_pg_dir;
|
||||
|
@ -493,7 +493,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
|
||||
|
|
|
@ -1174,7 +1174,7 @@ static void xen_exit_mmap(struct mm_struct *mm)
|
|||
spin_unlock(&mm->page_table_lock);
|
||||
}
|
||||
|
||||
static void __init xen_pagetable_setup_start(void)
|
||||
static void __init xen_pagetable_init(void)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -2068,7 +2068,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
|
|||
void __init xen_init_mmu_ops(void)
|
||||
{
|
||||
x86_init.mapping.pagetable_reserve = xen_mapping_pagetable_reserve;
|
||||
x86_init.paging.pagetable_setup_start = xen_pagetable_setup_start;
|
||||
x86_init.paging.pagetable_init = xen_pagetable_init;
|
||||
x86_init.paging.pagetable_setup_done = xen_pagetable_setup_done;
|
||||
pv_mmu_ops = xen_mmu_ops;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue