Module Name: src
Committed By: mrg
Date: Sun Jan 10 03:36:30 UTC 2010
Modified Files:
src/sys/arch/sparc/sparc: trap.c
Log Message:
put the cpu_number() into some messages.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/sparc/sparc/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/trap.c
diff -u src/sys/arch/sparc/sparc/trap.c:1.179 src/sys/arch/sparc/sparc/trap.c:1.180
--- src/sys/arch/sparc/sparc/trap.c:1.179 Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc/sparc/trap.c Sun Jan 10 03:36:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.179 2009/11/21 04:16:52 rmind Exp $ */
+/* $NetBSD: trap.c,v 1.180 2010/01/10 03:36:30 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.179 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.180 2010/01/10 03:36:30 mrg Exp $");
#include "opt_ddb.h"
#include "opt_compat_svr4.h"
@@ -841,7 +841,8 @@
if (type == T_TEXTFAULT) {
(void) splhigh();
snprintb(bits, sizeof(bits), SER_BITS, ser);
- printf("text fault: pc=0x%x ser=%s\n", pc, bits);
+ printf("cpu%d: text fault: pc=0x%x ser=%s\n",
+ cpu_number(), pc, bits);
panic("kernel fault");
/* NOTREACHED */
}
@@ -942,8 +943,9 @@
if (!onfault) {
(void) splhigh();
snprintb(bits, sizeof(bits), SER_BITS, ser);
- printf("data fault: pc=0x%x addr=0x%x ser=%s\n",
- pc, v, bits);
+ printf("cpu%d: data fault: pc=0x%x "
+ "addr=0x%x ser=%s\n",
+ cpu_number(), pc, v, bits);
panic("kernel fault");
/* NOTREACHED */
}
@@ -1160,8 +1162,8 @@
if (sfsr & SFSR_AT_TEXT || type == T_TEXTFAULT) {
(void) splhigh();
snprintb(bits, sizeof(bits), SFSR_BITS, sfsr);
- printf("text fault: pc=0x%x sfsr=%s sfva=0x%x\n", pc,
- bits, sfva);
+ printf("cpu%d text fault: pc=0x%x sfsr=%s sfva=0x%x\n",
+ cpu_number(), pc, bits, sfva);
panic("kernel fault");
/* NOTREACHED */
}
@@ -1229,8 +1231,9 @@
if (!onfault) {
(void) splhigh();
snprintb(bits, sizeof(bits), SFSR_BITS, sfsr);
- printf("data fault: pc=0x%x addr=0x%x sfsr=%s\n",
- pc, sfva, bits);
+ printf("cpu%d: data fault: pc=0x%x "
+ "addr=0x%x sfsr=%s\n",
+ cpu_number(), pc, sfva, bits);
panic("kernel fault");
/* NOTREACHED */
}
