From: Jesper Nilsson Date: Mon, 21 Jan 2008 14:49:43 +0000 (+0100) Subject: CRIS: Correct pfn_pte to make it possible to ioremap uncached addresses. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=620cf2e44206bde8a7777e29658b3752675c066b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git CRIS: Correct pfn_pte to make it possible to ioremap uncached addresses. --- diff --git a/include/asm-cris/pgtable.h b/include/asm-cris/pgtable.h index 417f71116215..a2607575681b 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))