[Linux-mips-commits]CVS: linux/arch/mips/sibyte/swarm memory.c,1.2,1.3 setup.c,1.12,1.13

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

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

Modified Files:
	memory.c 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: memory.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm/memory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- memory.c	12 Feb 2002 18:14:19 -0000	1.2
+++ memory.c	17 Sep 2002 18:20:01 -0000	1.3
@@ -22,15 +22,16 @@
 
 #include <linux/config.h>
 #include <linux/types.h>
+#include <linux/mm.h>
 #include <asm/page.h>
 
-extern phys_t swarm_mem_region_addrs[];
-extern phys_t swarm_mem_region_sizes[];
+extern phys_addr_t swarm_mem_region_addrs[];
+extern phys_addr_t swarm_mem_region_sizes[];
 extern unsigned int swarm_mem_region_count;
 
 int page_is_ram(unsigned long pagenr)
 {
-	phys_t addr = pagenr << PAGE_SHIFT;
+	phys_addr_t addr = pagenr << PAGE_SHIFT;
 #ifdef CONFIG_SWARM_STANDALONE
 	if (addr < (CONFIG_SIBYTE_SWARM_RAM_SIZE * 1024 * 1024)) {
 		return 1;

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm/setup.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- setup.c	30 May 2002 20:42:08 -0000	1.12
+++ setup.c	17 Sep 2002 18:20:01 -0000	1.13
@@ -72,8 +72,8 @@
 
 #ifndef CONFIG_SWARM_STANDALONE
 
-phys_t swarm_mem_region_addrs[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
-phys_t swarm_mem_region_sizes[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
+phys_addr_t swarm_mem_region_addrs[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
+phys_addr_t swarm_mem_region_sizes[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
 unsigned int swarm_mem_region_count;
 
 #endif