[Linux-mips-commits]CVS: linux/arch/mips/mm ioremap.c,1.6,1.7

[Steve L. <slo...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv30225/arch/mips/mm

Modified Files:
	ioremap.c 
Log Message:
- consolidate all architectures to use type phys_addr_t for physical
  addresses. MIPS-only phys_t is gone, replaced with phys_addr_t.

- remap_page_range() will "fixup" physaddr's for platforms with 64-bit
  physaddr support enabled, just as __ioremap() does.
  


Index: ioremap.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/ioremap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ioremap.c	9 Mar 2002 01:38:39 -0000	1.6
+++ ioremap.c	17 Sep 2002 18:20:01 -0000	1.7
@@ -15,9 +15,9 @@
 #include <asm/pgalloc.h>
 
 static inline void remap_area_pte(pte_t * pte, unsigned long address,
-	phys_t size, phys_t phys_addr, unsigned long flags)
+	phys_addr_t size, phys_addr_t phys_addr, unsigned long flags)
 {
-	phys_t end;
+	phys_addr_t end;
 	pgprot_t pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | __READABLE
 	                           | __WRITEABLE | flags);
 
@@ -40,9 +40,9 @@
 }
 
 static inline int remap_area_pmd(pmd_t * pmd, unsigned long address,
-	phys_t size, phys_t phys_addr, unsigned long flags)
+	phys_addr_t size, phys_addr_t phys_addr, unsigned long flags)
 {
-	phys_t end;
+	phys_addr_t end;
 
 	address &= ~PGDIR_MASK;
 	end = address + size;
@@ -62,8 +62,8 @@
 	return 0;
 }
 
-static int remap_area_pages(unsigned long address, phys_t phys_addr,
-	phys_t size, unsigned long flags)
+static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,
+	phys_addr_t size, unsigned long flags)
 {
 	int error;
 	pgd_t * dir;
@@ -97,12 +97,12 @@
  * Allow physical addresses to be fixed up to help 36 bit 
  * peripherals.
  */
-static phys_t def_ioremap_fixup(phys_t phys_addr, phys_t size)
+static phys_addr_t def_ioremap_fixup(phys_addr_t phys_addr, phys_addr_t size)
 {
 	return phys_addr;
 }
 
-phys_t (*__ioremap_fixup)(phys_t phys_addr, phys_t size) = def_ioremap_fixup;
+phys_addr_t (*__ioremap_fixup)(phys_addr_t phys_addr, phys_addr_t size) = def_ioremap_fixup;
 
 /*
  * Generic mapping function (not visible outside):
@@ -118,16 +118,16 @@
  * caller shouldn't need to know that small detail.
  */
 
-#define IS_LOW512(addr) (!((phys_t)(addr) & ~0x1fffffffUL)  && !((phys_t)addr & 0xFFFFFFFF00000000))
+#define IS_LOW512(addr) (!((phys_addr_t)(addr) & ~0x1fffffffUL)  && !((phys_addr_t)addr & 0xFFFFFFFF00000000))
 
-void * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
+void * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long flags)
 {
 	struct vm_struct * area;
 	unsigned long offset;
-	phys_t last_addr;
+	phys_addr_t last_addr;
 	void * addr;
 
-	phys_addr = __ioremap_fixup(phys_addr, size);
+	phys_addr = fixup_bigphys_addr(phys_addr, size);
 
 	/* Don't allow wraparound or zero size */
 	last_addr = phys_addr + size - 1;