diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 16:18:17 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 16:18:17 -0400 |
| commit | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (patch) | |
| tree | 2529afef2a74c40beaa3794d07b1b4a8ab374278 /arch/x86/mm | |
| parent | 51ea8a88aae425915b458bfe295f1f10a3d52781 (diff) | |
| parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
Merge branch 'x86/vmware' into x86/trampoline
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/pgtable.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 5c4ee422590..a96023e872a 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c | |||
| @@ -98,10 +98,6 @@ static void pgd_ctor(pgd_t *pgd) | |||
| 98 | clone_pgd_range(pgd + KERNEL_PGD_BOUNDARY, | 98 | clone_pgd_range(pgd + KERNEL_PGD_BOUNDARY, |
| 99 | swapper_pg_dir + KERNEL_PGD_BOUNDARY, | 99 | swapper_pg_dir + KERNEL_PGD_BOUNDARY, |
| 100 | KERNEL_PGD_PTRS); | 100 | KERNEL_PGD_PTRS); |
| 101 | paravirt_alloc_pmd_clone(__pa(pgd) >> PAGE_SHIFT, | ||
| 102 | __pa(swapper_pg_dir) >> PAGE_SHIFT, | ||
| 103 | KERNEL_PGD_BOUNDARY, | ||
| 104 | KERNEL_PGD_PTRS); | ||
| 105 | } | 101 | } |
| 106 | 102 | ||
| 107 | /* list required to sync kernel mapping updates */ | 103 | /* list required to sync kernel mapping updates */ |