patch-2.3.99-pre9 linux/arch/mips64/kernel/setup.c

• Lines: 39
• Date: Sat May 13 08:30:17 2000
• Orig file: v2.3.99-pre8/linux/arch/mips64/kernel/setup.c
• Orig date: Sat Feb 26 22:31:41 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/arch/mips64/kernel/setup.c linux/arch/mips64/kernel/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.7 2000/02/04 07:40:24 ralf Exp $
+/* $Id: setup.c,v 1.9 2000/03/14 01:39:27 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
@@ -37,10 +37,13 @@
 #include <asm/system.h>
 
 #ifdef CONFIG_SGI_IP27
+/* XXX Origin garbage has no business in this file  */
 #include <asm/sn/sn0/addrs.h>
 #endif
 
-struct mips_cpuinfo boot_cpu_data;
+#ifndef CONFIG_SMP
+struct cpuinfo_mips cpu_data[1];
+#endif
 
 #ifdef CONFIG_VT
 struct screen_info screen_info;
@@ -102,7 +105,10 @@
  * mips_io_port_base is the begin of the address space to which x86 style
  * I/O ports are mapped.
  */
+#ifdef CONFIG_SGI_IP27
+/* XXX Origin garbage has no business in this file  */
 unsigned long mips_io_port_base = IO_BASE;
+#endif
 
 extern void ip22_setup(void);
 extern void ip27_setup(void);
@@ -183,4 +189,6 @@
 			*memory_start_p = initrd_end;
 	}
 #endif
+
+	paging_init();
 }