patch-2.3.99-pre9 linux/arch/mips/kernel/proc.c

Next file: linux/arch/mips/kernel/process.c
Previous file: linux/arch/mips/kernel/mips_ksyms.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre8/linux/arch/mips/kernel/proc.c linux/arch/mips/kernel/proc.c
@@ -34,6 +34,7 @@
 	const char *mach_sgi_names[] = GROUP_SGI_NAMES;
 	const char *mach_cobalt_names[] = GROUP_COBALT_NAMES;
 	const char *mach_nec_ddb_names[] = GROUP_NEC_DDB_NAMES;
+	const char *mach_baget_names[] = GROUP_BAGET_NAMES;
 	const char **mach_group_to_name[] = { mach_unknown_names,
 	                                      mach_jazz_names,
 	                                      mach_dec_names,
@@ -42,7 +43,8 @@
 	                                      mach_acn_names,
 	                                      mach_sgi_names,
 					      mach_cobalt_names,
-					      mach_nec_ddb_names };
+					      mach_nec_ddb_names,
+					      mach_baget_names };
 	unsigned int version = read_32bit_cp0_register(CP0_PRID);
 	int len;
 
@@ -68,7 +70,7 @@
 	len += sprintf(buffer + len, "unaligned accesses\t: %lu\n",
 		       unaligned_instructions);
 	len += sprintf(buffer + len, "wait instruction\t: %s\n",
-	               wait_available ? "yes" : "no");
+	               cpu_wait ? "yes" : "no");
 	len += sprintf(buffer + len, "microsecond timers\t: %s\n",
 	               cyclecounter_available ? "yes" : "no");
 	len += sprintf(buffer + len, "extra interrupt vector\t: %s\n",
@@ -82,4 +84,9 @@
 	len += sprintf(buffer + len, fmt, 'I', vcei_count);
 
 	return len;
+}
+
+void init_irq_proc(void)
+{
+	/* Nothing, for now.  */
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)