From owner-p4-projects@FreeBSD.ORG Tue Oct 12 20:58:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09F5316A4D1; Tue, 12 Oct 2004 20:58:42 +0000 (GMT) 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 C20E516A4CE for ; Tue, 12 Oct 2004 20:58:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0C4F43D1F for ; Tue, 12 Oct 2004 20:58:41 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CKwfrq043223 for ; Tue, 12 Oct 2004 20:58:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CKwf2A043220 for perforce@freebsd.org; Tue, 12 Oct 2004 20:58:41 GMT (envelope-from jhb@freebsd.org) Date: Tue, 12 Oct 2004 20:58:41 GMT Message-Id: <200410122058.i9CKwf2A043220@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 63100 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, 12 Oct 2004 20:58:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=63100 Change 63100 by jhb@jhb_slimer on 2004/10/12 20:58:20 IFC @63091. Affected files ... .. //depot/projects/smpng/sys/dev/sio/sio.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#71 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#50 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#46 integrate Differences ... ==== //depot/projects/smpng/sys/dev/sio/sio.c#50 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.454 2004/09/20 13:55:26 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.455 2004/10/12 20:16:02 phk Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -993,14 +993,7 @@ tp->t_init_in.c_cflag = TTYDEF_CFLAG; tp->t_init_in.c_lflag = 0; if (unit == comconsole) { - tp->t_init_in.c_iflag = TTYDEF_IFLAG; - tp->t_init_in.c_oflag = TTYDEF_OFLAG; - tp->t_init_in.c_cflag = TTYDEF_CFLAG | CLOCAL; - tp->t_init_in.c_lflag = TTYDEF_LFLAG; - tp->t_lock_out.c_cflag = tp->t_lock_in.c_cflag = CLOCAL; - tp->t_lock_out.c_ispeed = tp->t_lock_out.c_ospeed = - tp->t_lock_in.c_ispeed = tp->t_lock_in.c_ospeed = - tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = comdefaultrate; + ttyconsolemode(tp, comdefaultrate); } else tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = TTYDEF_SPEED; if (siosetwater(com, tp->t_init_in.c_ispeed) != 0) { ==== //depot/projects/smpng/sys/kern/kern_thread.c#71 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.203 2004/10/06 00:40:41 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.204 2004/10/12 19:36:00 jhb Exp $"); #include #include @@ -1069,7 +1069,7 @@ * to continue however as this is a bad place to stop. */ if ((p->p_numthreads != 1) && (!P_SHOULDSTOP(p))) { - while (( td = TAILQ_FIRST(&p->p_suspended))) { + while ((td = TAILQ_FIRST(&p->p_suspended))) { thread_unsuspend_one(td); } } ==== //depot/projects/smpng/sys/netinet/udp_usrreq.c#50 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.166 2004/09/05 02:34:12 jmg Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.167 2004/10/12 20:03:56 rwatson Exp $ */ #include "opt_ipsec.h" @@ -363,9 +363,9 @@ udpstat.udps_noportbcast++; goto badheadlocked; } - INP_INFO_RUNLOCK(&udbinfo); udp_append(last, ip, m, iphlen + sizeof(struct udphdr)); INP_UNLOCK(last); + INP_INFO_RUNLOCK(&udbinfo); return; } /* @@ -399,15 +399,15 @@ return; } INP_LOCK(inp); - INP_INFO_RUNLOCK(&udbinfo); udp_append(inp, ip, m, iphlen + sizeof(struct udphdr)); INP_UNLOCK(inp); + INP_INFO_RUNLOCK(&udbinfo); return; badheadlocked: - INP_INFO_RUNLOCK(&udbinfo); if (inp) INP_UNLOCK(inp); + INP_INFO_RUNLOCK(&udbinfo); badunlocked: m_freem(m); if (opts) ==== //depot/projects/smpng/sys/sys/mbuf.h#46 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.162 2004/10/11 18:40:19 glebius Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.163 2004/10/12 20:18:27 glebius Exp $ */ #ifndef _SYS_MBUF_H_ @@ -319,7 +319,7 @@ /* * Network buffer allocation API * - * The rest of it is defined in kern/subr_mbuf.c + * The rest of it is defined in kern/kern_mbuf.c */ extern uma_zone_t zone_mbuf;