Skip to contentSkip to conversation

x86, vmware: Remove alloc_pmd_clone hook.

PATCH In review Alok Kataria 1 participant 2 messages Aug 24, 2010

Subsystems (4)
x86 x86 MM Xen hypervisor x86 PARAVIRT_OPS interface
lore
Share & tools
lore

Alok Kataria

author
#0 lore raw

PATCH 1/1 x86, vmware: Remove alloc_pmd_clone hook.

Patch on top of tip/x86/vmware

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 <[email protected]>
Cc Jeremy Fitzhardinge <[email protected]>
arch/x86/include/asm/paravirt.h +0 -5
Index: linux-tip-master/arch/x86/include/asm/paravirt.h
===================================================================
@@ -416,11 +416,6 @@ static inline void paravirt_alloc_pmd(st
 	PVOP_VCALL2(pv_mmu_ops.alloc_pmd, mm, pfn);
 }
 
-static inline void paravirt_alloc_pmd_clone(unsigned long pfn, unsigned long clonepfn,
-					    unsigned long start, unsigned long count)
-{
-	PVOP_VCALL4(pv_mmu_ops.alloc_pmd_clone, pfn, clonepfn, start, count);
-}
 static inline void paravirt_release_pmd(unsigned long pfn)
 {
 	PVOP_VCALL1(pv_mmu_ops.release_pmd, pfn);
arch/x86/include/asm/paravirt_types.h +0 -1
Index: linux-tip-master/arch/x86/include/asm/paravirt_types.h
===================================================================
@@ -255,7 +255,6 @@ struct pv_mmu_ops {
 	 */
 	void (*alloc_pte)(struct mm_struct *mm, unsigned long pfn);
 	void (*alloc_pmd)(struct mm_struct *mm, unsigned long pfn);
-	void (*alloc_pmd_clone)(unsigned long pfn, unsigned long clonepfn, unsigned long start, unsigned long count);
 	void (*alloc_pud)(struct mm_struct *mm, unsigned long pfn);
 	void (*release_pte)(unsigned long pfn);
 	void (*release_pmd)(unsigned long pfn);
arch/x86/kernel/paravirt.c +0 -1
Index: linux-tip-master/arch/x86/kernel/paravirt.c
===================================================================
@@ -413,7 +413,6 @@ struct pv_mmu_ops pv_mmu_ops = {
 
 	.alloc_pte = paravirt_nop,
 	.alloc_pmd = paravirt_nop,
-	.alloc_pmd_clone = paravirt_nop,
 	.alloc_pud = paravirt_nop,
 	.release_pte = paravirt_nop,
 	.release_pmd = paravirt_nop,
arch/x86/xen/mmu.c +0 -1
Index: linux-tip-master/arch/x86/xen/mmu.c
===================================================================
@@ -1969,7 +1969,6 @@ static const struct pv_mmu_ops xen_mmu_o
 	.alloc_pte = xen_alloc_pte_init,
 	.release_pte = xen_release_pte_init,
 	.alloc_pmd = xen_alloc_pmd_init,
-	.alloc_pmd_clone = paravirt_nop,
 	.release_pmd = xen_release_pmd_init,
 
 #ifdef CONFIG_X86_64
arch/x86/mm/pgtable.c +0 -4
Index: linux-tip-master/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 */
author
#1 lore raw

[tip:x86/vmware] x86, paravirt: Remove alloc_pmd_clone hook, only used by VMI

Commit-ID:  b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d
Gitweb:     http://git.kernel.org/tip/b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d
Author:     Alok Kataria <[email protected]>
AuthorDate: Mon, 23 Aug 2010 17:05:57 -0700
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 23 Aug 2010 17:09:44 -0700

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 <[email protected]>

LKML-Reference: <[email protected]>

Cc Jeremy Fitzhardinge <[email protected]>
Signed-off-by H. Peter Anvin <[email protected]>
---
 arch/x86/include/asm/paravirt.h       |    5 -----
 arch/x86/include/asm/paravirt_types.h |    1 -
 arch/x86/kernel/paravirt.c            |    1 -
 arch/x86/mm/pgtable.c                 |    4 ----
 arch/x86/xen/mmu.c                    |    1 -
 5 files changed, 0 insertions(+), 12 deletions(-)
arch/x86/include/asm/paravirt.h +0 -5
index 5653f43..edecb4e 100644
@@ -416,11 +416,6 @@ static inline void paravirt_alloc_pmd(struct mm_struct *mm, unsigned long pfn)
 	PVOP_VCALL2(pv_mmu_ops.alloc_pmd, mm, pfn);
 }
 
-static inline void paravirt_alloc_pmd_clone(unsigned long pfn, unsigned long clonepfn,
-					    unsigned long start, unsigned long count)
-{
-	PVOP_VCALL4(pv_mmu_ops.alloc_pmd_clone, pfn, clonepfn, start, count);
-}
 static inline void paravirt_release_pmd(unsigned long pfn)
 {
 	PVOP_VCALL1(pv_mmu_ops.release_pmd, pfn);
arch/x86/include/asm/paravirt_types.h +0 -1
index db9ef55..b82bac9 100644
@@ -255,7 +255,6 @@ struct pv_mmu_ops {
 	 */
 	void (*alloc_pte)(struct mm_struct *mm, unsigned long pfn);
 	void (*alloc_pmd)(struct mm_struct *mm, unsigned long pfn);
-	void (*alloc_pmd_clone)(unsigned long pfn, unsigned long clonepfn, unsigned long start, unsigned long count);
 	void (*alloc_pud)(struct mm_struct *mm, unsigned long pfn);
 	void (*release_pte)(unsigned long pfn);
 	void (*release_pmd)(unsigned long pfn);
arch/x86/kernel/paravirt.c +0 -1
index 1db183e..c5b2500 100644
@@ -413,7 +413,6 @@ struct pv_mmu_ops pv_mmu_ops = {
 
 	.alloc_pte = paravirt_nop,
 	.alloc_pmd = paravirt_nop,
-	.alloc_pmd_clone = paravirt_nop,
 	.alloc_pud = paravirt_nop,
 	.release_pte = paravirt_nop,
 	.release_pmd = paravirt_nop,
arch/x86/mm/pgtable.c +0 -4
index 5c4ee42..a96023e 100644
@@ -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 */
arch/x86/xen/mmu.c +0 -1
index 42086ac..b2363fc 100644
@@ -1969,7 +1969,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = {
 	.alloc_pte = xen_alloc_pte_init,
 	.release_pte = xen_release_pte_init,
 	.alloc_pmd = xen_alloc_pmd_init,
-	.alloc_pmd_clone = paravirt_nop,
 	.release_pmd = xen_release_pmd_init,
 
 #ifdef CONFIG_X86_64