Home » Mailing list archives » linux-kernel » 2008 » January » 16

[PATCH 7 of 8] x86/paravirt: make set_pmd operation common

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jeremy Fitzhardinge <jeremy@...>
To: Ingo Molnar <mingo@...>
Cc: LKML <linux-kernel@...>, Andi Kleen <ak@...>, Glauber de Oliveira Costa <glommer@...>, Jan Beulich <jbeulich@...>
Subject: [PATCH 7 of 8] x86/paravirt: make set_pmd operation common
Date: Wednesday, January 16, 2008 - 7:27 pm

Remove duplicate set_pmd()s.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
---
 include/asm-x86/paravirt.h |   43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h
--- a/include/asm-x86/paravirt.h
+++ b/include/asm-x86/paravirt.h
@@ -998,6 +998,16 @@ static inline void set_pte_at(struct mm_
 		PVOP_VCALL4(pv_mmu_ops.set_pte_at, mm, addr, ptep, pte.pte);
 }
 
+static inline void set_pmd(pmd_t *pmdp, pmd_t pmd)
+{
+	pmdval_t val = native_pmd_val(pmd);
+
+	if (sizeof(pmdval_t) > sizeof(long))
+		PVOP_VCALL3(pv_mmu_ops.set_pmd, pmdp, val, (u64)val >> 32);
+	else
+		PVOP_VCALL2(pv_mmu_ops.set_pmd, pmdp, val);
+}
+
 #ifdef CONFIG_X86_PAE
 /* Special-case pte-setting operations for PAE, which can't update a
    64-bit pte atomically */
@@ -1019,6 +1029,11 @@ static inline void pte_clear(struct mm_s
 {
 	PVOP_VCALL3(pv_mmu_ops.pte_clear, mm, addr, ptep);
 }
+
+static inline void pmd_clear(pmd_t *pmdp)
+{
+	PVOP_VCALL1(pv_mmu_ops.pmd_clear, pmdp);
+}
 #else  /* !CONFIG_X86_PAE */
 static inline void set_pte_atomic(pte_t *ptep, pte_t pte)
 {
@@ -1035,6 +1050,11 @@ static inline void pte_clear(struct mm_s
 			     pte_t *ptep)
 {
 	set_pte_at(mm, addr, ptep, __pte(0));
+}
+
+static inline void pmd_clear(pmd_t *pmdp)
+{
+	set_pmd(pmdp, __pmd(0));
 }
 #endif	/* CONFIG_X86_PAE */
 
@@ -1070,33 +1090,10 @@ static inline pmdval_t pmd_val(pmd_t pmd
 
 #ifdef CONFIG_X86_PAE
 
-static inline void set_pmd(pmd_t *pmdp, pmd_t pmdval)
-{
-	PVOP_VCALL3(pv_mmu_ops.set_pmd, pmdp,
-		    pmdval.pmd, pmdval.pmd >> 32);
-}
-
 static inline void set_pud(pud_t *pudp, pud_t pudval)
 {
 	PVOP_VCALL3(pv_mmu_ops.set_pud, pudp,
 		    pudval.pgd.pgd, pudval.pgd.pgd >> 32);
-}
-
-static inline void pmd_clear(pmd_t *pmdp)
-{
-	PVOP_VCALL1(pv_mmu_ops.pmd_clear, pmdp);
-}
-
-#else  /* !CONFIG_X86_PAE */
-
-static inline void set_pmd(pmd_t *pmdp, pmd_t pmdval)
-{
-	PVOP_VCALL2(pv_mmu_ops.set_pmd, pmdp, pmdval.pud.pgd.pgd);
-}
-
-static inline void pmd_clear(pmd_t *pmdp)
-{
-	set_pmd(pmdp, __pmd(0));
 }
 
 #endif	/* CONFIG_X86_PAE */


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0 of 8] x86: refactored paravirt mmu_ops, Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)
Re: [PATCH 0 of 8] x86: refactored paravirt mmu_ops, Ingo Molnar, (Thu Jan 17, 3:01 am)
[PATCH 3 of 8] x86/paravirt: common implementation for pte v..., Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)
[PATCH 5 of 8] x86/paravirt: common implementation for pmd v..., Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)
[PATCH 8 of 8] x86/paravirt: make set_pud operation common, Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)
[PATCH 7 of 8] x86/paravirt: make set_pmd operation common, Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)
[PATCH 6 of 8] x86/paravirt: make set_pte operations common, Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)
[PATCH 4 of 8] x86/paravirt: common implementation for pgd v..., Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)
[PATCH 2 of 8] x86/paravirt: rearrange common mmu_ops, Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)
[PATCH 1 of 8] add native_pud_val and _pmd_val for 2 and 3 l..., Jeremy Fitzhardinge, (Wed Jan 16, 7:27 pm)