From dd4bb212d07d9422c0020085ca0faa0e52e1bd62 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Mon, 21 Jan 2008 15:49:43 +0100 Subject: [PATCH] --- yaml --- r: 84986 b: refs/heads/master c: 620cf2e44206bde8a7777e29658b3752675c066b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-cris/pgtable.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 97ab974b993f..db1d23e57ffb 100644 --- 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 index 417f71116215..a2607575681b 100644 --- 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))