From 5d11b42ded42d14d8b3f45179047561d7d158dc2 Mon Sep 17 00:00:00 2001
From: Attilio Rao <attilio.rao@citrix.com>
Date: Tue, 21 Aug 2012 21:22:39 +0100
Subject: [PATCH] --- yaml --- r: 324029 b: refs/heads/master c:
 843b8ed2ec598aae5e3516b21957ede62a070e36 h: refs/heads/master i:   324027:
 bb4374e7442d0ea1fe5a1a82f46f49e72838ab1d v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/x86/include/asm/pgtable_types.h | 2 +-
 trunk/arch/x86/kernel/setup.c              | 1 -
 trunk/arch/x86/kernel/x86_init.c           | 1 -
 trunk/arch/x86/mm/init_32.c                | 1 +
 trunk/arch/x86/xen/mmu.c                   | 1 +
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 378979fd057d..360c16cc166c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7737b215ad0f94d20a87d98315da9f6cadaf35c9
+refs/heads/master: 843b8ed2ec598aae5e3516b21957ede62a070e36
diff --git a/trunk/arch/x86/include/asm/pgtable_types.h b/trunk/arch/x86/include/asm/pgtable_types.h
index 0c01e0730f7b..c93cb8eec7cc 100644
--- a/trunk/arch/x86/include/asm/pgtable_types.h
+++ b/trunk/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/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 61b7d9827afb..315fd24131ed 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/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/trunk/arch/x86/kernel/x86_init.c b/trunk/arch/x86/kernel/x86_init.c
index 0e1e950113b9..5f2478fb3d6d 100644
--- a/trunk/arch/x86/kernel/x86_init.c
+++ b/trunk/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/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
index 0e38e0e88046..e35b4b17189a 100644
--- a/trunk/arch/x86/mm/init_32.c
+++ b/trunk/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/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index 624efbefb942..c2ff7ea37b8c 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/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)