Commit 533330bf authored by Ralf Baechle's avatar Ralf Baechle
Browse files

On CONFIG_64BIT_PHYS_ADDR, pfn always fits in 'unsigned long', but 


pfn<<PAGE_SHIFT sometimes extends beyond.  The pte is big enough to hold
'long long', but the shift in pfn_pte() needs to do its calculation with
enough bits to hold the result.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0952e290

include/asm-mips/pgtable-32.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot) 
#define pfn_pte(pfn, prot)	__pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_val(prot))

#else

#define pte_pfn(x)		((unsigned long)((x).pte >> PAGE_SHIFT))

#define pfn_pte(pfn, prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))

#define pfn_pte(pfn, prot)	__pte(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot))

#endif

#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) */