diff options
| author | Alok Kataria <akataria@vmware.com> | 2010-08-23 20:05:57 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-08-23 20:09:44 -0400 |
| commit | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (patch) | |
| tree | 894032dc13902e0ad88fa6f5fc0de26ece1242d0 | |
| parent | 9863c90f682fba34cdc26c3437e8c00da6c83fa4 (diff) | |
x86, paravirt: Remove alloc_pmd_clone hook, only used by VMI
VMI was the only user of the alloc_pmd_clone hook, given that VMI
is now removed we can also remove this hook.
Signed-off-by: Alok N Kataria <akataria@vmware.com>
LKML-Reference: <1282608357.19396.36.camel@ank32.eng.vmware.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | arch/x86/include/asm/paravirt.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/paravirt_types.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/paravirt.c | 1 | ||||
| -rw-r--r-- | arch/x86/mm/pgtable.c | 4 | ||||
| -rw-r--r-- | arch/x86/xen/mmu.c | 1 |
5 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 5653f43d90e5..edecb4ed2210 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h | |||
| @@ -416,11 +416,6 @@ static inline void paravirt_alloc_pmd(struct mm_struct *mm, unsigned long pfn) | |||
| 416 | PVOP_VCALL2(pv_mmu_ops.alloc_pmd, mm, pfn); | 416 | PVOP_VCALL2(pv_mmu_ops.alloc_pmd, mm, pfn); |
| 417 | } | 417 | } |
| 418 | 418 | ||
| 419 | static inline void paravirt_alloc_pmd_clone(unsigned long pfn, unsigned long clonepfn, | ||
| 420 | unsigned long start, unsigned long count) | ||
| 421 | { | ||
| 422 | PVOP_VCALL4(pv_mmu_ops.alloc_pmd_clone, pfn, clonepfn, start, count); | ||
| 423 | } | ||
| 424 | static inline void paravirt_release_pmd(unsigned long pfn) | 419 | static inline void paravirt_release_pmd(unsigned long pfn) |
| 425 | { | 420 | { |
| 426 | PVOP_VCALL1(pv_mmu_ops.release_pmd, pfn); | 421 | PVOP_VCALL1(pv_mmu_ops.release_pmd, pfn); |
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index db9ef5532341..b82bac975250 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h | |||
| @@ -255,7 +255,6 @@ struct pv_mmu_ops { | |||
| 255 | */ | 255 | */ |
| 256 | void (*alloc_pte)(struct mm_struct *mm, unsigned long pfn); | 256 | void (*alloc_pte)(struct mm_struct *mm, unsigned long pfn); |
| 257 | void (*alloc_pmd)(struct mm_struct *mm, unsigned long pfn); | 257 | void (*alloc_pmd)(struct mm_struct *mm, unsigned long pfn); |
| 258 | void (*alloc_pmd_clone)(unsigned long pfn, unsigned long clonepfn, unsigned long start, unsigned long count); | ||
| 259 | void (*alloc_pud)(struct mm_struct *mm, unsigned long pfn); | 258 | void (*alloc_pud)(struct mm_struct *mm, unsigned long pfn); |
| 260 | void (*release_pte)(unsigned long pfn); | 259 | void (*release_pte)(unsigned long pfn); |
| 261 | void (*release_pmd)(unsigned long pfn); | 260 | void (*release_pmd)(unsigned long pfn); |
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 1db183ed7c01..c5b250011fd4 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
| @@ -413,7 +413,6 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
| 413 | 413 | ||
| 414 | .alloc_pte = paravirt_nop, | 414 | .alloc_pte = paravirt_nop, |
| 415 | .alloc_pmd = paravirt_nop, | 415 | .alloc_pmd = paravirt_nop, |
| 416 | .alloc_pmd_clone = paravirt_nop, | ||
| 417 | .alloc_pud = paravirt_nop, | 416 | .alloc_pud = paravirt_nop, |
| 418 | .release_pte = paravirt_nop, | 417 | .release_pte = paravirt_nop, |
| 419 | .release_pmd = paravirt_nop, | 418 | .release_pmd = paravirt_nop, |
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 5c4ee422590e..a96023e872ae 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 */ |
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 |
