Date: Tue, 4 Nov 2003 11:56:23 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 41373 for review Message-ID: <200311041956.hA4JuNAB058590@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=41373 Change 41373 by jhb@jhb_laptop on 2003/11/04 11:56:13 Backout the cred_free_thread() under INVARIANTS stuff. Also, I mismerged all the PTRACESTOP_SC() bits, so this fixes that. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/trap.c#52 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#65 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#59 edit .. //depot/projects/smpng/sys/kern/kern_fork.c#67 edit .. //depot/projects/smpng/sys/kern/kern_prot.c#76 edit .. //depot/projects/smpng/sys/kern/subr_trap.c#59 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#34 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#55 edit .. //depot/projects/smpng/sys/sys/ucred.h#21 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#52 (text+ko) ==== @@ -586,7 +586,7 @@ framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); userret(td, framep, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif } @@ -778,11 +778,9 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC PTRACESTOP_SC(p, td, S_PT_SCX); -#endif -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", ==== //depot/projects/smpng/sys/i386/i386/trap.c#65 (text+ko) ==== @@ -639,7 +639,7 @@ userret(td, &frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); userout: -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif out: @@ -1071,11 +1071,9 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC PTRACESTOP_SC(p, td, S_PT_SCX); -#endif -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#59 (text+ko) ==== @@ -843,7 +843,7 @@ if (user) { userret(td, framep, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif do_ast(framep); @@ -1013,11 +1013,9 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC PTRACESTOP_SC(p, td, S_PT_SCX); -#endif -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif @@ -1193,7 +1191,7 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", ==== //depot/projects/smpng/sys/kern/kern_fork.c#67 (text+ko) ==== @@ -805,7 +805,7 @@ kthread_exit(0); } PROC_UNLOCK(p); -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif mtx_assert(&Giant, MA_NOTOWNED); ==== //depot/projects/smpng/sys/kern/kern_prot.c#76 (text+ko) ==== @@ -1773,7 +1773,7 @@ return (newcr); } -#ifdef INVARIANTS +#ifdef DIAGNOSTIC void cred_free_thread(struct thread *td) { ==== //depot/projects/smpng/sys/kern/subr_trap.c#59 (text+ko) ==== @@ -265,7 +265,7 @@ } userret(td, framep, sticks); -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif mtx_assert(&Giant, MA_NOTOWNED); ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#34 (text+ko) ==== @@ -261,9 +261,9 @@ userret(td, frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); -#endif +#endif /* DIAGNOSTIC */ } static void ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#55 (text+ko) ==== @@ -289,7 +289,7 @@ userret(td, tf, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif } else { @@ -646,11 +646,9 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC PTRACESTOP_SC(p, td, S_PT_SCX); -#endif -#ifdef INVARIANTS +#ifdef DIAGNOSTIC cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", ==== //depot/projects/smpng/sys/sys/ucred.h#21 (text+ko) ==== @@ -85,7 +85,7 @@ #ifdef _KERNEL struct thread; -#ifdef INVARIANTS +#ifdef DIAGNOSTIC void cred_free_thread(struct thread *td); #endif void change_egid(struct ucred *newcred, gid_t egid);help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311041956.hA4JuNAB058590>