patch-2.2.0-pre7 linux/arch/alpha/kernel/setup.c

• Lines: 100
• Date: Sun Jan 10 09:59:59 1999
• Orig file: v2.2.0-pre6/linux/arch/alpha/kernel/setup.c
• Orig date: Wed Dec 16 10:32:54 1998

diff -u --recursive --new-file v2.2.0-pre6/linux/arch/alpha/kernel/setup.c linux/arch/alpha/kernel/setup.c
@@ -109,6 +109,7 @@
 extern struct alpha_machine_vector mikasa_mv;
 extern struct alpha_machine_vector mikasa_primo_mv;
 extern struct alpha_machine_vector monet_mv;
+extern struct alpha_machine_vector webbrick_mv;
 extern struct alpha_machine_vector noname_mv;
 extern struct alpha_machine_vector noritake_mv;
 extern struct alpha_machine_vector noritake_primo_mv;
@@ -116,6 +117,7 @@
 extern struct alpha_machine_vector pc164_mv;
 extern struct alpha_machine_vector rawhide_mv;
 extern struct alpha_machine_vector ruffian_mv;
+extern struct alpha_machine_vector rx164_mv;
 extern struct alpha_machine_vector sable_mv;
 extern struct alpha_machine_vector sable_gamma_mv;
 extern struct alpha_machine_vector sx164_mv;
@@ -137,6 +139,7 @@
 #pragma weak mikasa_mv
 #pragma weak mikasa_primo_mv
 #pragma weak monet_mv
+#pragma weak webbrick_mv
 #pragma weak noname_mv
 #pragma weak noritake_mv
 #pragma weak noritake_primo_mv
@@ -144,6 +147,7 @@
 #pragma weak pc164_mv
 #pragma weak rawhide_mv
 #pragma weak ruffian_mv
+#pragma weak rx164_mv
 #pragma weak sable_mv
 #pragma weak sable_gamma_mv
 #pragma weak sx164_mv
@@ -264,7 +268,7 @@
 		if (initrd_end > *memory_end_p) {
 			printk("initrd extends beyond end of memory "
 			       "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
-			       initrd_end, memory_end_p);
+			       initrd_end, (unsigned long) memory_end_p);
 			initrd_start = initrd_end = 0;
 		}
 	}
@@ -275,6 +279,16 @@
 	if (alpha_mv.init_arch)
 		alpha_mv.init_arch(memory_start_p, memory_end_p);
 
+	/* Initialize the timers.  */
+	/* ??? There is some circumstantial evidence that this needs
+	   to be done now rather than later in time_init, which would
+	   be more natural.  Someone please explain or refute.  */
+#if defined(CONFIG_RTC)
+	rtc_init_pit();
+#else
+	alpha_mv.init_pit();
+#endif
+
 	/* 
 	 * Give us a default console.  TGA users will see nothing until
 	 * chr_dev_init is called, rather late in the boot sequence.
@@ -349,8 +363,8 @@
 
 static char unofficial_names[][8] = {"100", "Ruffian"};
 
-static char eb164_names[][8] = {"EB164", "PC164", "LX164", "SX164"};
-static int eb164_indices[] = {0,0,0,1,1,1,1,1,2,2,2,2,3,3,3,3};
+static char eb164_names[][8] = {"EB164", "PC164", "LX164", "SX164", "RX164"};
+static int eb164_indices[] = {0,0,0,1,1,1,1,1,2,2,2,2,3,3,3,3,4};
 
 static char alcor_names[][16] = {"Alcor", "Maverick", "Bret"};
 static int alcor_indices[] = {0,0,0,1,1,1,0,0,0,0,0,0,2,2,2,2,2,2};
@@ -430,7 +444,7 @@
 
 	static struct alpha_machine_vector *eb164_vecs[] __initlocaldata =
 	{
-		&eb164_mv, &pc164_mv, &lx164_mv, &sx164_mv
+		&eb164_mv, &pc164_mv, &lx164_mv, &sx164_mv, &rx164_mv
 	};
 
 	static struct alpha_machine_vector *eb64p_vecs[] __initlocaldata =
@@ -455,7 +469,7 @@
 		&monet_mv,		/* monet */
 		&dp264_mv,		/* clipper */
 		&dp264_mv,		/* goldrush */
-		&dp264_mv,		/* webbrick */
+		&webbrick_mv,		/* webbrick */
 		&dp264_mv,		/* catamaran */
 	};
 
@@ -556,10 +570,12 @@
 		&pc164_mv,
 		&rawhide_mv,
 		&ruffian_mv,
+		&rx164_mv,
 		&sable_mv,
 		&sable_gamma_mv,
 		&sx164_mv,
 		&takara_mv,
+		&webbrick_mv,
 		&xl_mv,
 		&xlt_mv
 	};