From: Paul Mackerras <[EMAIL PROTECTED]>
ppc64 bits for remap_file_pages w/prot (no syscall table).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
---
linux-2.6.git-paolo/include/asm-ppc64/pgtable.h | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff -puN include/asm-ppc64/pgtable.h~rfp-arch-ppc64 include/asm-ppc64/pgtable.h
--- linux-2.6.git/include/asm-ppc64/pgtable.h~rfp-arch-ppc64 2005-08-12
18:42:20.000000000 +0200
+++ linux-2.6.git-paolo/include/asm-ppc64/pgtable.h 2005-08-12
18:42:20.000000000 +0200
@@ -62,8 +62,8 @@
*/
#define _PAGE_PRESENT 0x0001 /* software: pte contains a translation */
#define _PAGE_USER 0x0002 /* matches one of the PP bits */
-#define _PAGE_FILE 0x0002 /* (!present only) software: pte holds file
offset */
#define _PAGE_EXEC 0x0004 /* No execute on POWER4 and newer (we invert) */
+#define _PAGE_FILE 0x0008 /* !present: pte holds file offset */
#define _PAGE_GUARDED 0x0008
#define _PAGE_COHERENT 0x0010 /* M: enforce memory coherence (SMP systems) */
#define _PAGE_NO_CACHE 0x0020 /* I: cache inhibit */
@@ -492,9 +492,15 @@ extern void update_mmu_cache(struct vm_a
#define __swp_entry(type, offset) ((swp_entry_t) { ((type) << 1) | ((offset)
<< 8) })
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) >>
PTE_SHIFT })
#define __swp_entry_to_pte(x) ((pte_t) { (x).val << PTE_SHIFT })
-#define pte_to_pgoff(pte) (pte_val(pte) >> PTE_SHIFT)
-#define pgoff_to_pte(off) ((pte_t) {((off) << PTE_SHIFT)|_PAGE_FILE})
+
#define PTE_FILE_MAX_BITS (BITS_PER_LONG - PTE_SHIFT)
+#define pte_to_pgoff(pte) (pte_val(pte) >> PTE_SHIFT)
+#define pte_to_pgprot(pte) \
+__pgprot((pte_val(pte) & (_PAGE_USER|_PAGE_RW|_PAGE_PRESENT)) | _PAGE_ACCESSED)
+
+#define pgoff_prot_to_pte(off, prot) \
+ ((pte_t) { ((off) << PTE_SHIFT) | _PAGE_FILE \
+ | (pgprot_val(prot) & (_PAGE_USER|_PAGE_RW)) })
/*
* kern_addr_valid is intended to indicate whether an address is a valid
_
-
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/
