diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:53:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:53:24 -0400 |
| commit | 709d9f54cc1847a2d24224ffedec7fd4d0f3c714 (patch) | |
| tree | 28aa81a0f7425be438eb1a31e33a1d8ae90c0292 /arch/x86/xen | |
| parent | cca8209ed962f87990345ba073979d2b55dd1187 (diff) | |
| parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
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/xen')
| -rw-r--r-- | arch/x86/xen/mmu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 42086ac406af..b2363fcbcd0f 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -1969,7 +1969,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
| 1969 | .alloc_pte = xen_alloc_pte_init, | 1969 | .alloc_pte = xen_alloc_pte_init, |
| 1970 | .release_pte = xen_release_pte_init, | 1970 | .release_pte = xen_release_pte_init, |
| 1971 | .alloc_pmd = xen_alloc_pmd_init, | 1971 | .alloc_pmd = xen_alloc_pmd_init, |
| 1972 | .alloc_pmd_clone = paravirt_nop, | ||
| 1973 | .release_pmd = xen_release_pmd_init, | 1972 | .release_pmd = xen_release_pmd_init, |
| 1974 | 1973 | ||
| 1975 | #ifdef CONFIG_X86_64 | 1974 | #ifdef CONFIG_X86_64 |