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

[PATCH 2 of 8] x86/paravirt: rearrange common mmu_ops

!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 2 of 8] x86/paravirt: rearrange common mmu_ops
Date: Wednesday, January 16, 2008 - 7:27 pm

Rearrange the various pagetable mmu_ops to remove duplication.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
---
 include/asm-x86/paravirt.h |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 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
@@ -230,28 +230,32 @@ struct pv_mmu_ops {
 	void (*pte_update_defer)(struct mm_struct *mm,
 				 unsigned long addr, pte_t *ptep);
 
+	pteval_t (*pte_val)(pte_t);
+	pte_t (*make_pte)(pteval_t pte);
+
+	pgdval_t (*pgd_val)(pgd_t);
+	pgd_t (*make_pgd)(pgdval_t pgd);
+
+#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 (*set_pud)(pud_t *pudp, pud_t pudval);
 	void (*pte_clear)(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
 	void (*pmd_clear)(pmd_t *pmdp);
 
-	unsigned long long (*pte_val)(pte_t);
-	unsigned long long (*pmd_val)(pmd_t);
-	unsigned long long (*pgd_val)(pgd_t);
+#endif	/* CONFIG_X86_PAE */
 
-	pte_t (*make_pte)(unsigned long long pte);
-	pmd_t (*make_pmd)(unsigned long long pmd);
-	pgd_t (*make_pgd)(unsigned long long pgd);
-#else
-	unsigned long (*pte_val)(pte_t);
-	unsigned long (*pgd_val)(pgd_t);
+	void (*set_pud)(pud_t *pudp, pud_t pudval);
 
-	pte_t (*make_pte)(unsigned long pte);
-	pgd_t (*make_pgd)(unsigned long pgd);
-#endif
+	pmdval_t (*pmd_val)(pmd_t);
+	pmd_t (*make_pmd)(pmdval_t pmd);
+
+#if PAGETABLE_LEVELS == 4
+	pudval_t (*pud_val)(pud_t);
+	pud_t (*make_pud)(pudval_t pud);
+#endif	/* PAGETABLE_LEVELS == 4 */
+#endif	/* PAGETABLE_LEVELS >= 3 */
 
 #ifdef CONFIG_HIGHPTE
 	void *(*kmap_atomic_pte)(struct page *page, enum km_type type);


--
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)