---

yaml --- r: 84986 b: refs/heads/master c: 620cf2e h: refs/heads/master v: v3
git-mirror · Feb 8, 2008 · dd4bb21 · dd4bb21
1 parent b5255dd
commit dd4bb21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 058f5fdfd9953e7f856285b72f1c652683d5d19b
+refs/heads/master: 620cf2e44206bde8a7777e29658b3752675c066b
diff --git a/trunk/include/asm-cris/pgtable.h b/trunk/include/asm-cris/pgtable.h
@@ -249,7 +249,7 @@ static inline pgd_t * pgd_offset(struct mm_struct * mm, unsigned long address)
 #define pte_unmap(pte) do { } while (0)
 #define pte_unmap_nested(pte) do { } while (0)
 #define pte_pfn(x)		((unsigned long)(__va((x).pte)) >> PAGE_SHIFT)
-#define pfn_pte(pfn, prot)	__pte((__pa((pfn) << PAGE_SHIFT)) | pgprot_val(prot))
+#define pfn_pte(pfn, prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
 
 #define pte_ERROR(e) \
         printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), pte_val(e))