Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=620cf2e44206bde8a7777e29658b3752675c066b Commit: 620cf2e44206bde8a7777e29658b3752675c066b Parent: 058f5fdfd9953e7f856285b72f1c652683d5d19b Author: Jesper Nilsson <[EMAIL PROTECTED]> AuthorDate: Mon Jan 21 15:49:43 2008 +0100 Committer: Jesper Nilsson <[EMAIL PROTECTED]> CommitDate: Fri Feb 8 11:06:32 2008 +0100
CRIS: Correct pfn_pte to make it possible to ioremap uncached addresses. --- include/asm-cris/pgtable.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/asm-cris/pgtable.h b/include/asm-cris/pgtable.h index 417f711..a260757 100644 --- a/include/asm-cris/pgtable.h +++ b/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)) - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html