patch-2.2.11 linux/arch/alpha/kernel/setup.c

• Lines: 47
• Date: Mon Aug 9 12:05:13 1999
• Orig file: v2.2.10/linux/arch/alpha/kernel/setup.c
• Orig date: Sat May 22 13:42:31 1999

diff -u --recursive --new-file v2.2.10/linux/arch/alpha/kernel/setup.c linux/arch/alpha/kernel/setup.c
@@ -66,7 +66,7 @@
  * initialized, we need to copy things out into a more permanent
  * place.
  */
-#define PARAM			ZERO_PAGE
+#define PARAM			ZERO_PAGE(0)
 #define COMMAND_LINE		((char*)(PARAM + 0x0000))
 #define COMMAND_LINE_SIZE	256
 #define INITRD_START		(*(unsigned long *) (PARAM+0x100))
@@ -224,9 +224,16 @@
 	alpha_using_srm = strncmp((const char *)hwrpb->ssn, "MILO", 4) != 0;
 #endif
 
-	printk("Booting on %s%s%s using machine vector %s\n",
+	printk("%s on %s%s%s using machine vector %s from %s\n",
+#ifdef CONFIG_ALPHA_GENERIC
+	       "Booting GENERIC",
+#else
+	       "Booting",
+#endif
 	       type_name, (*var_name ? " variation " : ""),
-	       var_name, alpha_mv.vector_name);
+	       var_name, alpha_mv.vector_name,
+	       (alpha_using_srm ? "SRM" : "MILO"));
+
 	printk("Command line: %s\n", command_line);
 
 	/* 
@@ -727,7 +734,8 @@
 		      "BogoMIPS\t\t: %lu.%02lu\n"
 		      "kernel unaligned acc\t: %ld (pc=%lx,va=%lx)\n"
 		      "user unaligned acc\t: %ld (pc=%lx,va=%lx)\n"
-		      "platform string\t\t: %s\n",
+		      "platform string\t\t: %s\n"
+		      "cpus detected\t\t: %ld\n",
 		       cpu_name, cpu->variation, cpu->revision,
 		       (char*)cpu->serial_no,
 		       systype_name, sysvariation_name, hwrpb->sys_revision,
@@ -742,7 +750,7 @@
 		       loops_per_sec / 500000, (loops_per_sec / 5000) % 100,
 		       unaligned[0].count, unaligned[0].pc, unaligned[0].va,
 		       unaligned[1].count, unaligned[1].pc, unaligned[1].va,
-		       platform_string());
+		       platform_string(), hwrpb->nr_processors);
 
 #ifdef __SMP__
 	len += smp_info(buffer+len);