Merge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

* 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xfs: eagerly remove vmap mappings to avoid upsetting Xen
  xen: add some debug output for failed multicalls
  xen: fix incorrect vcpu_register_vcpu_info hypercall argument
  xen: ask the hypervisor how much space it needs reserved
  xen: lock pte pages while pinning/unpinning
  xen: deal with stale cr3 values when unpinning pagetables
  xen: add batch completion callbacks
  xen: yield to IPI target if necessary
  Clean up duplicate includes in arch/i386/xen/
  remove dead code in pgtable_cache_init
  paravirt: clean up lazy mode handling
  paravirt: refactor struct paravirt_ops into smaller pv_*_ops

1 files changed, 5 insertions, 17 deletions

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index dda4e83649a0..33d367a3432e 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -741,24 +741,12 @@ struct kmem_cache *pmd_cache;
 
 void __init pgtable_cache_init(void)
 {
-        size_t pgd_size = PTRS_PER_PGD*sizeof(pgd_t);
-
-        if (PTRS_PER_PMD > 1) {
+        if (PTRS_PER_PMD > 1)
                 pmd_cache = kmem_cache_create("pmd",
-                                        PTRS_PER_PMD*sizeof(pmd_t),
-                                        PTRS_PER_PMD*sizeof(pmd_t),
-                                        SLAB_PANIC,
-                                        pmd_ctor);
-                if (!SHARED_KERNEL_PMD) {
-                        /* If we're in PAE mode and have a non-shared
-                           kernel pmd, then the pgd size must be a
-                           page size.  This is because the pgd_list
-                           links through the page structure, so there
-                           can only be one pgd per page for this to
-                           work. */
-                        pgd_size = PAGE_SIZE;
-                }
-        }
+                                              PTRS_PER_PMD*sizeof(pmd_t),
+                                              PTRS_PER_PMD*sizeof(pmd_t),
+                                              SLAB_PANIC,
+                                              pmd_ctor);
 }
 
 /*