GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-09 08:02:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Rename pagetable_setup_start() to pagetable_init()

Browse source 
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:
Attilio Rao 2012-08-21 21:22:38 +01:00 • committed by Thomas Gleixner
parent 73090f8993
commit 7737b215ad
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/include/asm/pgtable_types.h
View file

@ -303,10 +303,10 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pte);
extern void native_pagetable_reserve(u64 start, u64 end); extern void native_pagetable_reserve(u64 start, u64 end);
#ifdef CONFIG_X86_32 #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); extern void native_pagetable_setup_done(pgd_t *base);
#else #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 #define native_pagetable_setup_done x86_init_pgd_done_noop
#endif #endif

4
arch/x86/include/asm/x86_init.h
View file

@ -81,11 +81,11 @@ struct x86_init_mapping {
/** /**
* struct x86_init_paging - platform specific paging functions * 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 * @pagetable_setup_done: platform specific post paging_init() call
*/ */
struct x86_init_paging { struct x86_init_paging {
void (*pagetable_setup_start)(void); void (*pagetable_init)(void);
void (*pagetable_setup_done)(pgd_t *base); void (*pagetable_setup_done)(pgd_t *base);
}; };

2
arch/x86/kernel/setup.c
View file

@ -961,7 +961,7 @@ void __init setup_arch(char **cmdline_p)
kvmclock_init(); kvmclock_init();
#endif #endif
x86_init.paging.pagetable_setup_start(); x86_init.paging.pagetable_init();
paging_init(); paging_init();
x86_init.paging.pagetable_setup_done(swapper_pg_dir); x86_init.paging.pagetable_setup_done(swapper_pg_dir);

4
arch/x86/kernel/x86_init.c
View file

@ -26,7 +26,7 @@
void __cpuinit x86_init_noop(void) { } void __cpuinit x86_init_noop(void) { }
void __init x86_init_uint_noop(unsigned int unused) { } 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) { } void __init x86_init_pgd_done_noop(pgd_t *unused) { }
int __init iommu_init_noop(void) { return 0; } int __init iommu_init_noop(void) { return 0; }
void iommu_shutdown_noop(void) { } void iommu_shutdown_noop(void) { }
@ -69,7 +69,7 @@ struct x86_init_ops x86_init __initdata = {
}, },
.paging = { .paging = {
.pagetable_setup_start = native_pagetable_setup_start, .pagetable_init = native_pagetable_init,
.pagetable_setup_done = native_pagetable_setup_done, .pagetable_setup_done = native_pagetable_setup_done,
}, },

4
arch/x86/mm/init_32.c
View file

@ -445,7 +445,7 @@ static inline void permanent_kmaps_init(pgd_t *pgd_base)
} }
#endif /* CONFIG_HIGHMEM */ #endif /* CONFIG_HIGHMEM */
void __init native_pagetable_setup_start(void) void __init native_pagetable_init(void)
{ {
unsigned long pfn, va; unsigned long pfn, va;
pgd_t *pgd, *base = swapper_pg_dir; 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 * If we're booting paravirtualized under a hypervisor, then there are
* more options: we may already be running PAE, and the pagetable may * more options: we may already be running PAE, and the pagetable may
* or may not be based in swapper_pg_dir. In any case, * 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. * appropriately for the rest of the initialization to work.
* *
* In general, pagetable_init() assumes that the pagetable may already * In general, pagetable_init() assumes that the pagetable may already

4
arch/x86/xen/mmu.c
View file

@ -1174,7 +1174,7 @@ static void xen_exit_mmap(struct mm_struct *mm)
spin_unlock(&mm->page_table_lock); 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) void __init xen_init_mmu_ops(void)
{ {
x86_init.mapping.pagetable_reserve = xen_mapping_pagetable_reserve; 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; x86_init.paging.pagetable_setup_done = xen_pagetable_setup_done;
pv_mmu_ops = xen_mmu_ops; pv_mmu_ops = xen_mmu_ops;