Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71ff49d7 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: with the last user gone, remove set_pte_present 



Impact: cleanup

set_pte_present() is no longer used, directly or indirectly,
so remove it.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Xen-devel <xen-devel@lists.xensource.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Alok Kataria <akataria@vmware.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Avi Kivity <avi@redhat.com>
LKML-Reference: <1237406613-2929-2-git-send-email-jeremy@goop.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b40c7579

arch/x86/include/asm/paravirt.h

+0 −15
Original line number Diff line number Diff line
@@ -317,8 +317,6 @@ struct pv_mmu_ops { 
#if PAGETABLE_LEVELS >= 3

#ifdef CONFIG_X86_PAE

	void (*set_pte_atomic)(pte_t *ptep, pte_t pteval);

	void (*set_pte_present)(struct mm_struct *mm, unsigned long addr,

				pte_t *ptep, pte_t pte);

	void (*pte_clear)(struct mm_struct *mm, unsigned long addr,

			  pte_t *ptep);

	void (*pmd_clear)(pmd_t *pmdp);
@@ -1365,13 +1363,6 @@ static inline void set_pte_atomic(pte_t *ptep, pte_t pte) 
		    pte.pte, pte.pte >> 32);

}



static inline void set_pte_present(struct mm_struct *mm, unsigned long addr,

				   pte_t *ptep, pte_t pte)

{

	/* 5 arg words */

	pv_mmu_ops.set_pte_present(mm, addr, ptep, pte);

}



static inline void pte_clear(struct mm_struct *mm, unsigned long addr,

			     pte_t *ptep)

{
@@ -1388,12 +1379,6 @@ static inline void set_pte_atomic(pte_t *ptep, pte_t pte) 
	set_pte(ptep, pte);

}



static inline void set_pte_present(struct mm_struct *mm, unsigned long addr,

				   pte_t *ptep, pte_t pte)

{

	set_pte(ptep, pte);

}



static inline void pte_clear(struct mm_struct *mm, unsigned long addr,

			     pte_t *ptep)

{

arch/x86/include/asm/pgtable-2level.h

+0 −7
Original line number Diff line number Diff line
@@ -26,13 +26,6 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 
	native_set_pte(ptep, pte);

}



static inline void native_set_pte_present(struct mm_struct *mm,

					  unsigned long addr,

					  pte_t *ptep, pte_t pte)

{

	native_set_pte(ptep, pte);

}



static inline void native_pmd_clear(pmd_t *pmdp)

{

	native_set_pmd(pmdp, __pmd(0));

arch/x86/include/asm/pgtable-3level.h

+0 −17
Original line number Diff line number Diff line
@@ -31,23 +31,6 @@ static inline void native_set_pte(pte_t *ptep, pte_t pte) 
	ptep->pte_low = pte.pte_low;

}



/*

 * Since this is only called on user PTEs, and the page fault handler

 * must handle the already racy situation of simultaneous page faults,

 * we are justified in merely clearing the PTE present bit, followed

 * by a set.  The ordering here is important.

 */

static inline void native_set_pte_present(struct mm_struct *mm,

					  unsigned long addr,

					  pte_t *ptep, pte_t pte)

{

	ptep->pte_low = 0;

	smp_wmb();

	ptep->pte_high = pte.pte_high;

	smp_wmb();

	ptep->pte_low = pte.pte_low;

}



static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)

{

	set_64bit((unsigned long long *)(ptep), native_pte_val(pte));

arch/x86/include/asm/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ extern struct list_head pgd_list; 
#define set_pte(ptep, pte)		native_set_pte(ptep, pte)

#define set_pte_at(mm, addr, ptep, pte)	native_set_pte_at(mm, addr, ptep, pte)



#define set_pte_present(mm, addr, ptep, pte)				\

	native_set_pte_present(mm, addr, ptep, pte)

#define set_pte_atomic(ptep, pte)					\

	native_set_pte_atomic(ptep, pte)

arch/x86/kernel/kvm.c

+0 −7
Original line number Diff line number Diff line
@@ -138,12 +138,6 @@ static void kvm_set_pte_atomic(pte_t *ptep, pte_t pte) 
	kvm_mmu_write(ptep, pte_val(pte));

}



static void kvm_set_pte_present(struct mm_struct *mm, unsigned long addr,

				pte_t *ptep, pte_t pte)

{

	kvm_mmu_write(ptep, pte_val(pte));

}



static void kvm_pte_clear(struct mm_struct *mm,

			  unsigned long addr, pte_t *ptep)

{
@@ -220,7 +214,6 @@ static void paravirt_ops_setup(void) 
#if PAGETABLE_LEVELS >= 3

#ifdef CONFIG_X86_PAE

		pv_mmu_ops.set_pte_atomic = kvm_set_pte_atomic;

		pv_mmu_ops.set_pte_present = kvm_set_pte_present;

		pv_mmu_ops.pte_clear = kvm_pte_clear;

		pv_mmu_ops.pmd_clear = kvm_pmd_clear;

#endif