patch-2.1.73 linux/arch/mips/kernel/setup.c

Next file: linux/arch/mips/kernel/signal.c
Previous file: linux/arch/mips/kernel/r6000_fpu.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.72/linux/arch/mips/kernel/setup.c linux/arch/mips/kernel/setup.c
@@ -4,6 +4,8 @@
  *  Copyright (C) 1995  Linus Torvalds
  *  Copyright (C) 1995, 1996  Ralf Baechle
  *  Copyright (C) 1996  Stoned Elipot
+ *
+ * $Id: setup.c,v 1.5 1997/12/06 08:55:42 ralf Exp $
  */
 #include <linux/config.h>
 #include <linux/errno.h>
@@ -59,6 +61,11 @@
 char wait_available;
 
 /*
+ * Do we have a cyclecounter available?
+ */
+char cyclecounter_available;
+
+/*
  * There are several bus types available for MIPS machines.  "RISC PC"
  * type machines have ISA, EISA, VLB or PCI available, DECstations
  * have Turbochannel or Q-Bus, SGI has GIO, there are lots of VME
@@ -120,6 +127,12 @@
 void (*irq_setup)(void);
 
 /*
+ * mips_io_port_base is the begin of the address space to which x86 style
+ * I/O ports are mapped.
+ */
+unsigned long mips_io_port_base;
+
+/*
  * isa_slot_offset is the address where E(ISA) busaddress 0 is is mapped
  * for the processor.
  */
@@ -168,9 +181,10 @@
 		break;
 #endif
 #if defined(CONFIG_MIPS_ARC) 
-/* Perhaps arch/mips/deskstation should be renommed arch/mips/arc.
- * For now CONFIG_MIPS_ARC means DeskStation. -Stoned.
- */
+	/*
+	 * Perhaps arch/mips/deskstation should be renamed to arch/mips/arc.
+	 * For now CONFIG_MIPS_ARC means DeskStation. -Stoned.
+	 */
 	case MACH_GROUP_ARC:
 		deskstation_setup();
 		break;
@@ -196,9 +210,6 @@
 
 	atag = bi_TagFind(tag_drive_info);
 	memcpy(&drive_info, TAGVALPTR(atag), atag->size);
-#if 0
-	aux_device_present = AUX_DEVICE_INFO;
-#endif
 
 	memory_end = mips_memory_upper;
 	/*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov