X86/XEN: Allow setup function x86_init.paging.pagetable_init to setup kernel pagetables

Currently, x86_init.paging.pagetable_init relies on callers to setup the
kernel pagetable.  In order to unify the functionality of
x86_init.paging.pagetable_setup_start and x86_init.paging.pagetable_setup_done
allow the new setup function to perform the operation itself.

diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index 0c01e0730f7b9187dcf195810a26afde0db8f16f..c93cb8eec7cc5e7855dca269d11c6c8a53cd3e6a 100644 (file)
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -306,7 +306,7 @@ extern void native_pagetable_reserve(u64 start, u64 end);
 extern void native_pagetable_init(void);
 extern void native_pagetable_setup_done(pgd_t *base);
 #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
 #endif
 

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 61b7d9827afb0bdd5619bce04cbcf16e2dbff6e5..315fd24131edf39e1a7b14246cfe9902116cd107 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();
-       paging_init();
        x86_init.paging.pagetable_setup_done(swapper_pg_dir);
 
        if (boot_cpu_data.cpuid_level >= 0) {

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 0e1e950113b92a266a50a3f340f2fd97c1287da4..5f2478fb3d6d910d95559fe9eb683eceeb48f5b1 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_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) { }

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 0e38e0e88046f0a2ddad360939f925ec00e4d451..e35b4b17189a8c615bcb5ee9bcde4f0383488aab 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -475,6 +475,7 @@ void __init native_pagetable_init(void)
                pte_clear(NULL, va, pte);
        }
        paravirt_alloc_pmd(&init_mm, __pa(base) >> PAGE_SHIFT);
+       paging_init();
 }
 
 void __init native_pagetable_setup_done(pgd_t *base)

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 139bb16c41c66d6bb03af6ddd4cabfa4919617cb..c8f7f07e60f0af0df03678c9da63211b8bf50dc9 100644 (file)
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1176,6 +1176,7 @@ static void xen_exit_mmap(struct mm_struct *mm)
 
 static void __init xen_pagetable_init(void)
 {
+       paging_init();
 }
 
 static __init void xen_mapping_pagetable_reserve(u64 start, u64 end)