X86/XEN: Remove the base argument from x86_init.paging.pagetable_setup_start

x86_init.paging.pagetable_setup_start for native will however use
swapper_pg_dir in the single place where it is used and for native the
argument is simply unused. Aditionally, the comments already point to
swapper_pg_dir as the sole base touched.
Finally, this will help with further merging of
x86_init.paging.pagetable_setup_start with
x86_init.paging.pagetable_setup_done.

diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index 013286a10c2c03680d10e5a2938f800e90581514..e02b875e692233aa2ecf9868a4a3796644f8a988 100644 (file)
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -303,11 +303,11 @@ 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(pgd_t *base);
+extern void native_pagetable_setup_start(void);
 extern void native_pagetable_setup_done(pgd_t *base);
 #else
-#define native_pagetable_setup_start x86_init_pgd_noop
-#define native_pagetable_setup_done  x86_init_pgd_noop
+#define native_pagetable_setup_start x86_init_pgd_start_noop
+#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 b22093cd2a514904728a520ed91167db723cd2ed..3396c94044288afde5b674d6ed3892e5e6dd09f4 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -100,7 +100,7 @@ struct x86_init_mapping {
  * @pagetable_setup_done:      platform specific post paging_init() call
  */
 struct x86_init_paging {
-       void (*pagetable_setup_start)(pgd_t *base);
+       void (*pagetable_setup_start)(void);
        void (*pagetable_setup_done)(pgd_t *base);
 };
 

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f4b9b80e1b95e2a9d0341fd62ed4412949b52243..90cbbe00adca4bd5ae556552b4b54207cf15705c 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -961,7 +961,7 @@ void __init setup_arch(char **cmdline_p)
        kvmclock_init();
 #endif
 
-       x86_init.paging.pagetable_setup_start(swapper_pg_dir);
+       x86_init.paging.pagetable_setup_start();
        paging_init();
        x86_init.paging.pagetable_setup_done(swapper_pg_dir);
 

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 9f3167e891ef4af9f92c57ac8092790412906ee3..3b88493ec7cae8ff56dc57dc124c67d2b0320fb5 100644 (file)
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -26,7 +26,8 @@
 
 void __cpuinit x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
-void __init x86_init_pgd_noop(pgd_t *unused) { }
+void __init x86_init_pgd_start_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 575d86f85ce400b2a6798876bd76250bda317828..c4aa1b25ba342dcddade396dacf30ea2d37c71ef 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -445,10 +445,10 @@ static inline void permanent_kmaps_init(pgd_t *pgd_base)
 }
 #endif /* CONFIG_HIGHMEM */
 
-void __init native_pagetable_setup_start(pgd_t *base)
+void __init native_pagetable_setup_start(void)
 {
        unsigned long pfn, va;
-       pgd_t *pgd;
+       pgd_t *pgd, *base = swapper_pg_dir;
        pud_t *pud;
        pmd_t *pmd;
        pte_t *pte;

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index dfae43ad553fc63bd72838245b73cb7eb09c06b3..f48dc110d9a6f223188536eadb7f2845a454b184 100644 (file)
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -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(pgd_t *base)
+static void __init xen_pagetable_setup_start(void)
 {
 }