Merge with Linux 2.3.24.

6 files changed, 42 insertions, 8 deletions

diff --git a/arch/mips64/config.in b/arch/mips64/config.in
index ead24edff..823c375a6 100644
--- a/arch/mips64/config.in
+++ b/arch/mips64/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.6 2000/01/17 23:32:46 ralf Exp $
+# $Id: config.in,v 1.7 2000/01/20 23:50:27 ralf Exp $
 #
 # For a description of the syntax of this configuration file,
 # see the Configure script.
@@ -111,6 +111,8 @@ if [ "$CONFIG_SCSI" != "n" ]; then
 fi
 endmenu
 
+source drivers/i2o/Config.in
+
 if [ "$CONFIG_NET" = "y" ]; then
    mainmenu_option next_comment
    comment 'Network device support'
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig
index 028845a25..ab794d555 100644
--- a/arch/mips64/defconfig
+++ b/arch/mips64/defconfig
@@ -66,6 +66,7 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BLK_DEV_MD is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_XD is not set
+# CONFIG_BLK_DEV_DAC960 is not set
 CONFIG_PARIDE_PARPORT=m
 # CONFIG_BLK_DEV_IDE_MODES is not set
 # CONFIG_BLK_DEV_HD is not set
@@ -107,6 +108,16 @@ CONFIG_SKB_LARGE=y
 # CONFIG_SCSI is not set
 
 #
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_PCI is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_LAN is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
+#
 # Network device support
 #
 CONFIG_NETDEVICES=y
diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22
index 1a987ef90..b270cb5dd 100644
--- a/arch/mips64/defconfig-ip22
+++ b/arch/mips64/defconfig-ip22
@@ -104,6 +104,16 @@ CONFIG_SKB_LARGE=y
 # CONFIG_SCSI is not set
 
 #
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_PCI is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_LAN is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
+#
 # Network device support
 #
 CONFIG_NETDEVICES=y
diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27
index 028845a25..ab794d555 100644
--- a/arch/mips64/defconfig-ip27
+++ b/arch/mips64/defconfig-ip27
@@ -66,6 +66,7 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BLK_DEV_MD is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_XD is not set
+# CONFIG_BLK_DEV_DAC960 is not set
 CONFIG_PARIDE_PARPORT=m
 # CONFIG_BLK_DEV_IDE_MODES is not set
 # CONFIG_BLK_DEV_HD is not set
@@ -107,6 +108,16 @@ CONFIG_SKB_LARGE=y
 # CONFIG_SCSI is not set
 
 #
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_PCI is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_LAN is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
+#
 # Network device support
 #
 CONFIG_NETDEVICES=y
diff --git a/arch/mips64/mm/init.c b/arch/mips64/mm/init.c
index 473e798e8..d4da03f56 100644
--- a/arch/mips64/mm/init.c
+++ b/arch/mips64/mm/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.7 2000/01/27 01:05:24 ralf Exp $
+/* $Id: init.c,v 1.8 2000/01/27 23:21:57 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -354,7 +354,7 @@ extern int page_is_ram(unsigned long pagenr);
 void __init mem_init(void)
 {
 	unsigned long codesize, reservedpages, datasize, initsize;
-	unsigned long tmp, nonram;
+	unsigned long tmp, ram;
 
 	max_mapnr = num_physpages = max_low_pfn;
 	high_memory = (void *) __va(max_mapnr << PAGE_SHIFT);
@@ -362,10 +362,10 @@ void __init mem_init(void)
 	totalram_pages += free_all_bootmem();
 	totalram_pages -= setup_zero_pages();	/* Setup zeroed pages.  */
 
-	reservedpages = nonram = 0;
+	reservedpages = ram = 0;
 	for (tmp = 0; tmp < max_low_pfn; tmp++)
 		if (page_is_ram(tmp)) {
-			nonram++;
+			ram++;
 			if (PageReserved(mem_map+tmp))
 				reservedpages++;
 		}
@@ -377,7 +377,7 @@ void __init mem_init(void)
 	printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
 	       "%ldk data, %ldk init)\n",
 	       (unsigned long) nr_free_pages << (PAGE_SHIFT-10),
-	       (max_mapnr - nonram) << (PAGE_SHIFT-10),
+	       ram << (PAGE_SHIFT-10),
 	       codesize >> 10,
 	       reservedpages << (PAGE_SHIFT-10),
 	       datasize >> 10,
diff --git a/arch/mips64/sgi-ip27/ip27-setup.c b/arch/mips64/sgi-ip27/ip27-setup.c
index ace1d7b8f..c97eeb8b6 100644
--- a/arch/mips64/sgi-ip27/ip27-setup.c
+++ b/arch/mips64/sgi-ip27/ip27-setup.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ip27-setup.c,v 1.3 2000/01/21 22:34:03 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -23,7 +23,7 @@
 
 /* Check against user dumbness.  */
 #ifdef CONFIG_VT
-#error "CONFIG_VT not allowed for IP27."
+#error CONFIG_VT not allowed for IP27.
 #endif
 
 /*