[Linux-mips-commits]CVS: linux/arch/mips/sibyte/swarm setup.c,1.7,1.8

[James S. <jsi...@us...>]

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

Modified Files:
	setup.c 
Log Message:
se propper value for MAX_RAM_SIZE for depending on configuration. Set board_timer_setup not board_time_init to swarm_time_init.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm/setup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- setup.c	28 Jan 2002 19:23:58 -0000	1.7
+++ setup.c	12 Feb 2002 18:04:27 -0000	1.8
@@ -59,14 +59,15 @@
 #ifdef CONFIG_HIGHMEM
 #ifdef CONFIG_64BIT_PHYS_ADDR
 /* #define MAX_RAM_SIZE (0xffffffffffffffff) */
-#define MAX_RAM_SIZE (0xffffffff)
+#define MAX_RAM_SIZE (~0ULL)
 #else
-#define MAX_RAM_SIZE (0xffffffff)
+#define MAX_RAM_SIZE (0xffffffffULL)
 #endif
 #else
-#define MAX_RAM_SIZE (0xfffffff)
+#define MAX_RAM_SIZE (0x1fffffffULL)
 #endif
 
+
 #ifndef CONFIG_SWARM_STANDALONE
 
 phys_t swarm_mem_region_addrs[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
@@ -250,7 +251,7 @@
 #endif
 	       " runs\n");
 
-	board_time_init = swarm_time_init;
+	board_timer_setup = swarm_time_init;
 
 #ifdef CONFIG_BLK_DEV_IDE_SWARM
 	ide_ops = &swarm_ide_ops;
@@ -270,7 +271,7 @@
 
 static __init void prom_meminit(void)
 {
-	unsigned long long addr, size; /* regardless of 64BIT_PHYS_ADDR */
+	u64 addr, size; /* regardless of 64BIT_PHYS_ADDR */
 	long type;
 	unsigned int idx;
 	int rd_flag;