Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Fix the fixup_bigphys_addr compile problem.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Pete Popov and committed by
Ralf Baechle
f10fae02 10f6567e

+4 -2
+3 -1
include/asm-mips/mach-au1x00/ioremap.h
··· 12 12 #include <linux/config.h> 13 13 #include <linux/types.h> 14 14 15 - #ifndef CONFIG_64BIT_PHYS_ADDR 15 + #ifdef CONFIG_64BIT_PHYS_ADDR 16 + extern phys_t __fixup_bigphys_addr(phys_t, phys_t); 17 + #else 16 18 static inline phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size) 17 19 { 18 20 return phys_addr;
+1 -1
include/asm-mips/pgtable.h
··· 16 16 #include <asm/pgtable-64.h> 17 17 #endif 18 18 19 + #include <asm/io.h> 19 20 #include <asm/pgtable-bits.h> 20 21 21 22 #define PAGE_NONE __pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT) ··· 363 362 #endif 364 363 365 364 #ifdef CONFIG_64BIT_PHYS_ADDR 366 - extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size); 367 365 extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); 368 366 369 367 static inline int io_remap_pfn_range(struct vm_area_struct *vma,