diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 20:53:24 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 20:53:24 (GMT) |
commit | 709d9f54cc1847a2d24224ffedec7fd4d0f3c714 (patch) | |
tree | 28aa81a0f7425be438eb1a31e33a1d8ae90c0292 /arch/x86/mm/pgtable.c | |
parent | cca8209ed962f87990345ba073979d2b55dd1187 (diff) | |
parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
download | linux-fsl-qoriq-709d9f54cc1847a2d24224ffedec7fd4d0f3c714.tar.xz |
Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, paravirt: Remove alloc_pmd_clone hook, only used by VMI
x86, vmware: Remove deprecated VMI kernel support
Fix up trivial #include conflict in arch/x86/kernel/smpboot.c
Diffstat (limited to 'arch/x86/mm/pgtable.c')
-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 c70e57d..8be8c7d 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -110,10 +110,6 @@ static void pgd_ctor(struct mm_struct *mm, 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 */ |