[RFC v2][PATCH 06/35] cris: create ptemap.h

Dave Hansen
2009-05-20T18:24:56Z

linux-2.6.git-dave/arch/cris/include/asm/pgtable.h | 7 +------
linux-2.6.git-dave/arch/cris/include/asm/ptemap.h | 11 +++++++++++
2 files changed, 12 insertions(+), 6 deletions(-)

diff -puN arch/cris/include/asm/pgtable.h~cris-ptemaph arch/cris/include/asm/pgtable.h
--- linux-2.6.git/arch/cris/include/asm/pgtable.h~cris-ptemaph 2009-04-30 15:10:56.000000000 -0700
+++ linux-2.6.git-dave/arch/cris/include/asm/pgtable.h 2009-04-30 15:10:56.000000000 -0700
@@ -244,12 +244,7 @@ static inline pgd_t * pgd_offset(const s
(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
#define pte_offset_kernel(dir, address) \
((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address))
-#define pte_offset_map(dir, address) \
- ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address))
-#define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)
-
-#define pte_unmap(pte) do { } while (0)
-#define pte_unmap_nested(pte) do { } while (0)
+#include <asm/ptemap.h>
#define pte_pfn(x) ((unsigned long)(__va((x).pte)) >> PAGE_SHIFT)
#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))

diff -puN arch/cris/include/asm/ptemap.h~cris-ptemaph arch/cris/include/asm/ptemap.h
--- linux-2.6.git/arch/cris/include/asm/ptemap.h~cris-ptemaph 2009-04-30 15:10:56.000000000 -0700
+++ linux-2.6.git-dave/arch/cris/include/asm/ptemap.h 2009-04-30 15:10:56.000000000 -0700
@@ -0,0 +1,11 @@
+#ifndef _CRIS_ASM_PTEMAP_H
+#define _CRIS_ASM_PTEMAP_H
+
+#define pte_offset_map(dir, address) \
+ ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address))
+#define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)
+
+#define pte_unmap(pte) do { } while (0)
+#define pte_unmap_nested(pte) do { } while (0)
+
+#endif /* _CRIS_ASM_PTEMAP_H */
_