[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1500 setup.c,1.8,1.9

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

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

Modified Files:
	setup.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: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1500/setup.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- setup.c	1 May 2002 18:00:30 -0000	1.8
+++ setup.c	17 Sep 2002 18:20:00 -0000	1.9
@@ -79,8 +79,9 @@
 extern struct resource ioport_resource;
 extern struct resource iomem_resource;
 
-extern phys_t (*__ioremap_fixup)(phys_t phys_addr, phys_t size);
-static phys_t pb1500_ioremap_fixup(phys_t phys_addr, phys_t size);
+extern phys_addr_t (*__ioremap_fixup)(phys_addr_t phys_addr, phys_addr_t size);
+static phys_addr_t pb1500_ioremap_fixup(phys_addr_t phys_addr,
+					phys_addr_t size);
 
 void au1500_wbflush(void)
 {
@@ -267,7 +268,8 @@
 #endif
 }
 
-static phys_t pb1500_ioremap_fixup(phys_t phys_addr, phys_t size)
+static phys_addr_t pb1500_ioremap_fixup(phys_addr_t phys_addr,
+					phys_addr_t size)
 {
 	u32 pci_start = (u32)Au1500_PCI_MEM_START;
 	u32 pci_end = (u32)Au1500_PCI_MEM_END;
@@ -277,10 +279,8 @@
 
 	/* check for pci memory window */
 	if ((phys_addr >= pci_start) && ((phys_addr + size) < pci_end)) {
-		return (phys_t)((phys_addr - pci_start) + Au1500_PCI_MEM_START);
-	}
-	else if (phys_addr > (pci_start + size)) {
-		printk("warning: bad remap address: %Lx\n", phys_addr);
+		return (phys_addr_t)((phys_addr - pci_start) +
+				     Au1500_PCI_MEM_START);
 	}
 	else 
 		return phys_addr;