X86/XEN: Move content of xen_pagetable_setup_done() into xen_pagetable_init() and...

At this stage x86_init.paging.pagetable_setup_done is only used in the
XEN case. Move its content in the x86_init.paging.pagetable_init setup
function and remove the now unused x86_init.paging.pagetable_setup_done
remaining infrastructure.

diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index c93cb8eec7cc5e7855dca269d11c6c8a53cd3e6a..db8fec6d2953936a6a450ea27eeacf7475f3aa11 100644 (file)
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -304,10 +304,8 @@ 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_init(void);
-extern void native_pagetable_setup_done(pgd_t *base);
 #else
 #define native_pagetable_init        paging_init
-#define native_pagetable_setup_done  x86_init_pgd_done_noop
 #endif
 
 struct seq_file;

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 4cc4675b3edea3e3ddc7566c2f89c37298f7bdbd..b6104e8cd00400ee24601faa4488c1f493cc6654 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -97,11 +97,9 @@ struct x86_init_mapping {
 /**
  * struct x86_init_paging - platform specific paging functions
  * @pagetable_init:            platform specific paging initialization call
- * @pagetable_setup_done:      platform specific post paging_init() call
  */
 struct x86_init_paging {
        void (*pagetable_init)(void);
-       void (*pagetable_setup_done)(pgd_t *base);
 };
 
 /**

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 315fd24131edf39e1a7b14246cfe9902116cd107..4f165479c4537cee4badf71a4862826936d7a228 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -962,7 +962,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
        x86_init.paging.pagetable_init();
-       x86_init.paging.pagetable_setup_done(swapper_pg_dir);
 
        if (boot_cpu_data.cpuid_level >= 0) {
                /* A CPU has %cr4 if and only if it has CPUID */

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 5f2478fb3d6d910d95559fe9eb683eceeb48f5b1..7a3d075a814a9c83a603df93b5961f247049e624 100644 (file)
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -26,7 +26,6 @@
 
 void __cpuinit x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
-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 +68,6 @@ struct x86_init_ops x86_init __initdata = {
 
        .paging = {
                .pagetable_init         = native_pagetable_init,
-               .pagetable_setup_done   = native_pagetable_setup_done,
        },
 
        .timers = {

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index e35b4b17189a8c615bcb5ee9bcde4f0383488aab..4f04db1500270967a1f0d0abe8cfb4fd118aadeb 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -478,10 +478,6 @@ void __init native_pagetable_init(void)
        paging_init();
 }
 
-void __init native_pagetable_setup_done(pgd_t *base)
-{
-}
-
 /*
  * Build a proper pagetable for the kernel mappings.  Up until this
  * point, we've been running on some set of pagetables constructed by

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index c8f7f07e60f0af0df03678c9da63211b8bf50dc9..50a6d2cab9c8a8aa4e5b611cd1df9aa8b4fb6cb9 100644 (file)
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1174,9 +1174,13 @@ static void xen_exit_mmap(struct mm_struct *mm)
        spin_unlock(&mm->page_table_lock);
 }
 
+static void xen_post_allocator_init(void);
+
 static void __init xen_pagetable_init(void)
 {
        paging_init();
+       xen_setup_shared_info();
+       xen_post_allocator_init();
 }
 
 static __init void xen_mapping_pagetable_reserve(u64 start, u64 end)
@@ -1211,14 +1215,6 @@ static __init void xen_mapping_pagetable_reserve(u64 start, u64 end)
        }
 }
 
-static void xen_post_allocator_init(void);
-
-static void __init xen_pagetable_setup_done(pgd_t *base)
-{
-       xen_setup_shared_info();
-       xen_post_allocator_init();
-}
-
 static void xen_write_cr2(unsigned long cr2)
 {
        this_cpu_read(xen_vcpu)->arch.cr2 = cr2;
@@ -2088,7 +2084,6 @@ void __init xen_init_mmu_ops(void)
 {
        x86_init.mapping.pagetable_reserve = xen_mapping_pagetable_reserve;
        x86_init.paging.pagetable_init = xen_pagetable_init;
-       x86_init.paging.pagetable_setup_done = xen_pagetable_setup_done;
        pv_mmu_ops = xen_mmu_ops;
 
        memset(dummy_mapping, 0xff, PAGE_SIZE);