Use unified pte_bfop helper to manipulate bits in pte/pgoff bitfield.
Signed-off-by: Cyrill Gorcunov <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Pavel Emelyanov <[email protected]>
Cc: Matt Mackall <[email protected]>
Cc: Xiao Guangrong <[email protected]>
Cc: Marcelo Tosatti <[email protected]>
Cc: KOSAKI Motohiro <[email protected]>
Cc: Stephen Rothwell <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: "Aneesh Kumar K.V" <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
arch/x86/include/asm/pgtable-2level.h | 51 ++++++++++++++++++----------------
1 file changed, 27 insertions(+), 24 deletions(-)
Index: linux-2.6.git/arch/x86/include/asm/pgtable-2level.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/pgtable-2level.h
+++ linux-2.6.git/arch/x86/include/asm/pgtable-2level.h
@@ -55,8 +55,11 @@ static inline pmd_t native_pmdp_get_and_
#define native_pmdp_get_and_clear(xp) native_local_pmdp_get_and_clear(xp)
#endif
-#define _mfrob(v,r,m,l) ((((v) >> (r)) & (m)) << (l))
-#define __frob(v,r,l) (((v) >> (r)) << (l))
+/*
+ * For readable bitfield manipulations.
+ */
+#define PTE_FILE_NOMASK (-1U)
+#define pte_bfop(v,r,m,l) ((((v) >> (r)) & (m)) << (l))
#ifdef CONFIG_MEM_SOFT_DIRTY
@@ -82,18 +85,18 @@ static inline pmd_t native_pmdp_get_and_
#define PTE_FILE_LSHIFT3 (PTE_FILE_BITS1 + PTE_FILE_BITS2)
#define PTE_FILE_LSHIFT4 (PTE_FILE_BITS1 + PTE_FILE_BITS2 +
PTE_FILE_BITS3)
-#define pte_to_pgoff(pte)
\
- (_mfrob((pte).pte_low, PTE_FILE_SHIFT1, PTE_FILE_MASK1, 0)
+ \
- _mfrob((pte).pte_low, PTE_FILE_SHIFT2, PTE_FILE_MASK2,
PTE_FILE_LSHIFT2) + \
- _mfrob((pte).pte_low, PTE_FILE_SHIFT3, PTE_FILE_MASK3,
PTE_FILE_LSHIFT3) + \
- __frob((pte).pte_low, PTE_FILE_SHIFT4, PTE_FILE_LSHIFT4))
-
-#define pgoff_to_pte(off)
\
- ((pte_t) { .pte_low =
\
- _mfrob(off, 0, PTE_FILE_MASK1, PTE_FILE_SHIFT1) +
\
- _mfrob(off, PTE_FILE_LSHIFT2, PTE_FILE_MASK2, PTE_FILE_SHIFT2) +
\
- _mfrob(off, PTE_FILE_LSHIFT3, PTE_FILE_MASK3, PTE_FILE_SHIFT3) +
\
- __frob(off, PTE_FILE_LSHIFT4, PTE_FILE_SHIFT4) +
\
+#define pte_to_pgoff(pte)
\
+ (pte_bfop((pte).pte_low, PTE_FILE_SHIFT1, PTE_FILE_MASK1, 0)
+ \
+ pte_bfop((pte).pte_low, PTE_FILE_SHIFT2, PTE_FILE_MASK2,
PTE_FILE_LSHIFT2) + \
+ pte_bfop((pte).pte_low, PTE_FILE_SHIFT3, PTE_FILE_MASK3,
PTE_FILE_LSHIFT3) + \
+ pte_bfop((pte).pte_low, PTE_FILE_SHIFT4, PTE_FILE_NOMASK,
PTE_FILE_LSHIFT4))
+
+#define pgoff_to_pte(off)
\
+ ((pte_t) { .pte_low =
\
+ pte_bfop(off, 0, PTE_FILE_MASK1, PTE_FILE_SHIFT1)
+ \
+ pte_bfop(off, PTE_FILE_LSHIFT2, PTE_FILE_MASK2, PTE_FILE_SHIFT2)
+ \
+ pte_bfop(off, PTE_FILE_LSHIFT3, PTE_FILE_MASK3, PTE_FILE_SHIFT3)
+ \
+ pte_bfop(off, PTE_FILE_LSHIFT4, PTE_FILE_NOMASK, PTE_FILE_SHIFT4)
+ \
_PAGE_FILE })
#else /* CONFIG_MEM_SOFT_DIRTY */
@@ -120,16 +123,16 @@ static inline pmd_t native_pmdp_get_and_
#define PTE_FILE_LSHIFT2 (PTE_FILE_BITS1)
#define PTE_FILE_LSHIFT3 (PTE_FILE_BITS1 + PTE_FILE_BITS2)
-#define pte_to_pgoff(pte)
\
- (_mfrob((pte).pte_low, PTE_FILE_SHIFT1, PTE_FILE_MASK1, 0)
+ \
- _mfrob((pte).pte_low, PTE_FILE_SHIFT2, PTE_FILE_MASK2,
PTE_FILE_LSHIFT2) + \
- __frob((pte).pte_low, PTE_FILE_SHIFT3, PTE_FILE_LSHIFT3))
-
-#define pgoff_to_pte(off)
\
- ((pte_t) { .pte_low =
\
- _mfrob(off, 0, PTE_FILE_MASK1, PTE_FILE_SHIFT1) +
\
- _mfrob(off, PTE_FILE_LSHIFT2, PTE_FILE_MASK2, PTE_FILE_SHIFT2) +
\
- __frob(off, PTE_FILE_LSHIFT3, PTE_FILE_SHIFT3) +
\
+#define pte_to_pgoff(pte)
\
+ (pte_bfop((pte).pte_low, PTE_FILE_SHIFT1, PTE_FILE_MASK1, 0)
+ \
+ pte_bfop((pte).pte_low, PTE_FILE_SHIFT2, PTE_FILE_MASK2,
PTE_FILE_LSHIFT2) + \
+ pte_bfop((pte).pte_low, PTE_FILE_SHIFT3, PTE_FILE_NOMASK,
PTE_FILE_LSHIFT3))
+
+#define pgoff_to_pte(off)
\
+ ((pte_t) { .pte_low =
\
+ pte_bfop(off, 0, PTE_FILE_MASK1, PTE_FILE_SHIFT1)
+ \
+ pte_bfop(off, PTE_FILE_LSHIFT2, PTE_FILE_MASK2, PTE_FILE_SHIFT2)
+ \
+ pte_bfop(off, PTE_FILE_LSHIFT3, PTE_FILE_NOMASK, PTE_FILE_SHIFT3)
+ \
_PAGE_FILE })
#endif /* CONFIG_MEM_SOFT_DIRTY */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
