Commit 843b8ed2 authored by Attilio Rao's avatar Attilio Rao Committed by Thomas Gleixner

x86: Move paging_init() call to x86_init.paging.pagetable_init()

Move the paging_init() call to the platform specific pagetable_init()
function, so we can get rid of the extra pagetable_setup_done()
function pointer.
Signed-off-by: default avatarAttilio Rao <attilio.rao@citrix.com>
Acked-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-4-git-send-email-attilio.rao@citrix.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7737b215
...@@ -306,7 +306,7 @@ extern void native_pagetable_reserve(u64 start, u64 end); ...@@ -306,7 +306,7 @@ extern void native_pagetable_reserve(u64 start, u64 end);
extern void native_pagetable_init(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_init x86_init_pgd_init_noop #define native_pagetable_init paging_init
#define native_pagetable_setup_done x86_init_pgd_done_noop #define native_pagetable_setup_done x86_init_pgd_done_noop
#endif #endif
......
...@@ -962,7 +962,6 @@ void __init setup_arch(char **cmdline_p) ...@@ -962,7 +962,6 @@ void __init setup_arch(char **cmdline_p)
#endif #endif
x86_init.paging.pagetable_init(); x86_init.paging.pagetable_init();
paging_init();
x86_init.paging.pagetable_setup_done(swapper_pg_dir); x86_init.paging.pagetable_setup_done(swapper_pg_dir);
if (boot_cpu_data.cpuid_level >= 0) { if (boot_cpu_data.cpuid_level >= 0) {
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
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_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) { }
......
...@@ -475,6 +475,7 @@ void __init native_pagetable_init(void) ...@@ -475,6 +475,7 @@ void __init native_pagetable_init(void)
pte_clear(NULL, va, pte); pte_clear(NULL, va, pte);
} }
paravirt_alloc_pmd(&init_mm, __pa(base) >> PAGE_SHIFT); paravirt_alloc_pmd(&init_mm, __pa(base) >> PAGE_SHIFT);
paging_init();
} }
void __init native_pagetable_setup_done(pgd_t *base) void __init native_pagetable_setup_done(pgd_t *base)
......
...@@ -1176,6 +1176,7 @@ static void xen_exit_mmap(struct mm_struct *mm) ...@@ -1176,6 +1176,7 @@ static void xen_exit_mmap(struct mm_struct *mm)
static void __init xen_pagetable_init(void) static void __init xen_pagetable_init(void)
{ {
paging_init();
} }
static __init void xen_mapping_pagetable_reserve(u64 start, u64 end) static __init void xen_mapping_pagetable_reserve(u64 start, u64 end)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment