CVS Update@linux-mips.org: linux

[ppopov@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ppopov@ftp.linux-mips.org       05/07/14 01:17:06

Modified files:
        include/asm-mips: pgtable.h 
        include/asm-mips/mach-au1x00: ioremap.h 

Log message:
        Fix the fixup_bigphys_addr compile problem.

diff -urN linux/include/asm-mips/pgtable.h linux/include/asm-mips/pgtable.h
--- linux/include/asm-mips/pgtable.h    2005/07/11 20:48:37     1.106
+++ linux/include/asm-mips/pgtable.h    2005/07/14 00:17:05     1.107
@@ -16,6 +16,7 @@
 #include <asm/pgtable-64.h>
 #endif
 
+#include <asm/io.h>
 #include <asm/pgtable-bits.h>
 
 #define PAGE_NONE      __pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT)
@@ -360,7 +361,6 @@
 #endif
 
 #ifdef CONFIG_64BIT_PHYS_ADDR
-extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size);
 extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, 
unsigned long pfn, unsigned long size, pgprot_t prot);
 
 static inline int io_remap_page_range(struct vm_area_struct *vma,
diff -urN linux/include/asm-mips/mach-au1x00/ioremap.h 
linux/include/asm-mips/mach-au1x00/ioremap.h
--- linux/include/asm-mips/mach-au1x00/ioremap.h        2005/06/30 10:48:46     
1.1
+++ linux/include/asm-mips/mach-au1x00/ioremap.h        2005/07/14 00:17:06     
1.2
@@ -11,7 +11,9 @@
 
 #include <linux/types.h>
 
-#ifndef CONFIG_64BIT_PHYS_ADDR
+#ifdef CONFIG_64BIT_PHYS_ADDR
+extern inline phys_t __fixup_bigphys_addr(phys_t, phys_t);
+#else
 static inline phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
 {
        return phys_addr;