public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Alok Kataria <akataria@vmware.com>
To: "H. Peter Anvin" <hpa@zytor.com>,
	the arch/x86 maintainers <x86@kernel.org>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>,
	Chris Wright <chrisw@sous-sol.org>,
	Rusty Russell <rusty@rustcorp.com.au>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86, vmware: Remove alloc_pmd_clone hook.
Date: Mon, 23 Aug 2010 17:05:57 -0700	[thread overview]
Message-ID: <1282608357.19396.36.camel@ank32.eng.vmware.com> (raw)

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 <akataria@vmware.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>

Index: linux-tip-master/arch/x86/include/asm/paravirt.h
===================================================================
--- linux-tip-master.orig/arch/x86/include/asm/paravirt.h	2010-08-23 11:36:03.000000000 -0700
+++ linux-tip-master/arch/x86/include/asm/paravirt.h	2010-08-23 16:34:26.000000000 -0700
@@ -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);
Index: linux-tip-master/arch/x86/include/asm/paravirt_types.h
===================================================================
--- linux-tip-master.orig/arch/x86/include/asm/paravirt_types.h	2010-08-23 11:36:03.000000000 -0700
+++ linux-tip-master/arch/x86/include/asm/paravirt_types.h	2010-08-23 16:34:39.000000000 -0700
@@ -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);
Index: linux-tip-master/arch/x86/kernel/paravirt.c
===================================================================
--- linux-tip-master.orig/arch/x86/kernel/paravirt.c	2010-08-23 11:36:03.000000000 -0700
+++ linux-tip-master/arch/x86/kernel/paravirt.c	2010-08-23 16:34:45.000000000 -0700
@@ -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,
Index: linux-tip-master/arch/x86/xen/mmu.c
===================================================================
--- linux-tip-master.orig/arch/x86/xen/mmu.c	2010-08-23 16:29:20.000000000 -0700
+++ linux-tip-master/arch/x86/xen/mmu.c	2010-08-23 16:35:16.000000000 -0700
@@ -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
Index: linux-tip-master/arch/x86/mm/pgtable.c
===================================================================
--- linux-tip-master.orig/arch/x86/mm/pgtable.c	2010-08-23 11:36:03.000000000 -0700
+++ linux-tip-master/arch/x86/mm/pgtable.c	2010-08-23 16:38:48.000000000 -0700
@@ -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 */



             reply	other threads:[~2010-08-24  0:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-24  0:05 Alok Kataria [this message]
2010-08-24  0:40 ` [tip:x86/vmware] x86, paravirt: Remove alloc_pmd_clone hook, only used by VMI tip-bot for Alok Kataria

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1282608357.19396.36.camel@ank32.eng.vmware.com \
    --to=akataria@vmware.com \
    --cc=chrisw@sous-sol.org \
    --cc=hpa@zytor.com \
    --cc=jeremy@xensource.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rusty@rustcorp.com.au \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox