From owner-p4-projects@FreeBSD.ORG Tue Nov 4 11:56:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49B7B16A4D1; Tue, 4 Nov 2003 11:56:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1BE216A4D0 for ; Tue, 4 Nov 2003 11:56:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 840C343FD7 for ; Tue, 4 Nov 2003 11:56:24 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA4JuOXJ058595 for ; Tue, 4 Nov 2003 11:56:24 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA4JuNAB058590 for perforce@freebsd.org; Tue, 4 Nov 2003 11:56:23 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 4 Nov 2003 11:56:23 -0800 (PST) Message-Id: <200311041956.hA4JuNAB058590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 41373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2003 19:56:26 -0000 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);