summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarr <arr@FreeBSD.org>2002-02-28 08:28:14 +0000
committerarr <arr@FreeBSD.org>2002-02-28 08:28:14 +0000
commit0aaddb66e91852f0b3c032d2fff8616a358e0654 (patch)
treeba2c1bb4172bc32f5630796b7360e7aab73eab8b
parent8cb475ee0d3c10ff04d00511e37e2799800ba3a1 (diff)
downloadFreeBSD-src-0aaddb66e91852f0b3c032d2fff8616a358e0654.zip
FreeBSD-src-0aaddb66e91852f0b3c032d2fff8616a358e0654.tar.gz
- Fix panic() message and a couple style nits that snuck in from the
recent diagnostics commit (rev. 1.84).
-rw-r--r--sys/alpha/alpha/trap.c6
-rw-r--r--sys/ia64/ia64/trap.c6
-rw-r--r--sys/powerpc/aim/trap.c6
-rw-r--r--sys/powerpc/powerpc/trap.c6
-rw-r--r--sys/sparc64/sparc64/trap.c6
5 files changed, 15 insertions, 15 deletions
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index c0b1327..af9be44 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -298,11 +298,11 @@ trap(a0, a1, a2, entry, framep)
sticks = td->td_kse->ke_sticks;
td->td_frame = framep;
#ifdef DIAGNOSTIC /* see the comment in ast() */
- if (td->td_ucred)
- panic("trap: thread got a cred while in userspace");
+ if (td->td_ucred != NULL)
+ panic("trap(): thread got a ucred while in userspace");
td->td_ucred = td->td_ucred_cache;
td->td_ucred_cache = NULL;
-#endif /* DIAGNOSTIC */
+#endif
if (td->td_ucred != p->p_ucred)
cred_update_thread(td);
} else {
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 141ae9b..bf5c2cd 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -324,11 +324,11 @@ trap(int vector, int imm, struct trapframe *framep)
sticks = td->td_kse->ke_sticks;
td->td_frame = framep;
#ifdef DIAGNOSTIC /* see the comment in ast() */
- if (td->td_ucred)
- panic("trap:thread got a cred while userspace");
+ if (td->td_ucred != NULL)
+ panic("trap(): thread got a ucred while in userspace");
td->td_ucred = td->td_ucred_cache;
td->td_ucred_cache = NULL;
-#endif /* DIAGNOSTIC */
+#endif
if (td->td_ucred != p->p_ucred)
cred_update_thread(td);
} else {
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index 5a08c63..64cbf75 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -227,11 +227,11 @@ trap(struct trapframe *frame)
sticks = td->td_kse->ke_sticks;
td->td_frame = frame;
#ifdef DIAGNOSTIC /* see the comment in ast() */
- if (td->td_ucred)
- panic("trap:thread got a cred while userspace");
+ if (td->td_ucred != NULL)
+ panic("trap(): thread got a ucred while in userspace");
td->td_ucred = td->td_ucred_cache;
td->td_ucred_cache = NULL;
-#endif /* DIAGNOSTIC */
+#endif
if (td->td_ucred != p->p_ucred)
cred_update_thread(td);
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index 5a08c63..64cbf75 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -227,11 +227,11 @@ trap(struct trapframe *frame)
sticks = td->td_kse->ke_sticks;
td->td_frame = frame;
#ifdef DIAGNOSTIC /* see the comment in ast() */
- if (td->td_ucred)
- panic("trap:thread got a cred while userspace");
+ if (td->td_ucred != NULL)
+ panic("trap(): thread got a ucred while in userspace");
td->td_ucred = td->td_ucred_cache;
td->td_ucred_cache = NULL;
-#endif /* DIAGNOSTIC */
+#endif
if (td->td_ucred != p->p_ucred)
cred_update_thread(td);
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index 13e74f8..6302d45 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -176,11 +176,11 @@ trap(struct trapframe *tf)
sticks = td->td_kse->ke_sticks;
td->td_frame = tf;
#ifdef DIAGNOSTIC /* see the comment in ast() */
- if (td->td_ucred)
- panic("trap:thread got a cred while userspace");
+ if (td->td_ucred != NULL)
+ panic("trap(): thread got a ucred while in userspace");
td->td_ucred = td->td_ucred_cache;
td->td_ucred_cache = NULL;
-#endif /* DIAGNOSTIC */
+#endif
if (td->td_ucred != p->p_ucred)
cred_update_thread(td);
} else {
OpenPOWER on IntegriCloud