summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-10-20 13:18:17 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-10-20 13:18:17 -0700
commite44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (patch)
tree2529afef2a74c40beaa3794d07b1b4a8ab374278 /arch/x86/mm
parent51ea8a88aae425915b458bfe295f1f10a3d52781 (diff)
parentb0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff)
downloadop-kernel-dev-e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4.zip
op-kernel-dev-e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4.tar.gz
Merge branch 'x86/vmware' into x86/trampoline
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/pgtable.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index 5c4ee42..a96023e 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -98,10 +98,6 @@ static void pgd_ctor(pgd_t *pgd)
clone_pgd_range(pgd + KERNEL_PGD_BOUNDARY,
swapper_pg_dir + KERNEL_PGD_BOUNDARY,
KERNEL_PGD_PTRS);
- paravirt_alloc_pmd_clone(__pa(pgd) >> PAGE_SHIFT,
- __pa(swapper_pg_dir) >> PAGE_SHIFT,
- KERNEL_PGD_BOUNDARY,
- KERNEL_PGD_PTRS);
}
/* list required to sync kernel mapping updates */
OpenPOWER on IntegriCloud