diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2005-08-17 10:11:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 19:32:09 +0100 |
| commit | 533330bf7fa19854f3b4accd2b84ff58e3ee160f (patch) | |
| tree | 841eb3e66c58a34a7f57701fa50fd6d7bbafcda5 /include | |
| parent | 0952e2905c6bc2e12a43910c7eb898b6481a57b5 (diff) | |
| download | linux-533330bf7fa19854f3b4accd2b84ff58e3ee160f.tar.gz | |
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: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/pgtable-32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 217afc375a841..0cff64ce0fb88 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h @@ -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) */ |