Date: Tue, 4 Mar 2003 13:18:30 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26338 for review Message-ID: <200303042118.h24LIUO5063038@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26338 Change 26338 by jhb@jhb_laptop on 2003/03/04 13:18:08 IFC my own changes. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/trap.c#43 integrate .. //depot/projects/smpng/sys/conf/options.i386#22 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#51 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#50 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#29 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#73 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#19 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#29 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#46 integrate .. //depot/projects/smpng/sys/sys/lock.h#26 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#26 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#43 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.108 2003/02/27 02:05:15 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.109 2003/03/04 21:03:04 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* ==== //depot/projects/smpng/sys/conf/options.i386#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.184 2003/01/15 20:15:33 phk Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.185 2003/03/04 20:24:52 jhb Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h ==== //depot/projects/smpng/sys/i386/conf/NOTES#51 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1077 2003/02/26 23:36:58 ru Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1078 2003/03/04 20:24:52 jhb Exp $ # # ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#39 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.203 2003/02/24 14:36:03 nyan Exp $ + * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.204 2003/03/04 20:24:53 jhb Exp $ */ #include "opt_cpu.h" ==== //depot/projects/smpng/sys/i386/i386/trap.c#50 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.243 2003/02/27 02:05:16 julian Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.244 2003/03/04 21:03:04 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#42 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.70 2003/02/27 03:16:35 davidxu Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.71 2003/03/04 21:03:04 jhb Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ ==== //depot/projects/smpng/sys/kern/kern_condvar.c#25 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.37 2003/02/27 08:43:27 harti Exp $ + * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.38 2003/03/04 21:03:04 jhb Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/kern/kern_intr.c#27 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_intr.c,v 1.90 2003/02/19 05:47:25 imp Exp $ + * $FreeBSD: src/sys/kern/kern_intr.c,v 1.91 2003/03/04 21:01:42 jhb Exp $ * */ ==== //depot/projects/smpng/sys/kern/kern_lock.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)kern_lock.c 8.18 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/kern/kern_lock.c,v 1.65 2003/02/25 03:37:46 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_lock.c,v 1.66 2003/03/04 21:03:04 jhb Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/kern/kern_mac.c#17 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.78 2003/02/19 05:47:25 imp Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.79 2003/03/04 21:03:04 jhb Exp $ */ /* * Developed by the TrustedBSD Project. ==== //depot/projects/smpng/sys/kern/kern_mutex.c#59 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.118 2003/02/25 22:28:46 mtm Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.120 2003/03/04 20:32:41 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/kern/kern_sig.c#54 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.212 2003/02/27 02:05:17 julian Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.213 2003/03/04 21:03:04 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/kern/kern_synch.c#42 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.213 2003/02/27 08:43:27 harti Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.214 2003/03/04 21:03:04 jhb Exp $ */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#29 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.140 2003/02/22 17:58:06 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.141 2003/03/04 21:03:04 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/kern/subr_mbuf.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.40 2003/02/20 04:26:58 bmilekic Exp $ + * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.41 2003/03/04 21:03:05 jhb Exp $ */ #include "opt_mac.h" ==== //depot/projects/smpng/sys/kern/subr_trap.c#47 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.246 2003/02/27 02:05:18 julian Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.247 2003/03/04 21:03:05 jhb Exp $ */ #include "opt_mac.h" ==== //depot/projects/smpng/sys/kern/subr_witness.c#73 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/subr_witness.c,v 1.138 2003/02/18 03:36:49 peter Exp $ + * $FreeBSD: src/sys/kern/subr_witness.c,v 1.139 2003/03/04 20:56:39 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/pci/if_xl.c#19 (text+ko) ==== @@ -101,7 +101,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.130 2003/02/22 14:46:31 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.131 2003/03/04 20:19:26 bmilekic Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2439,7 +2439,7 @@ m_new = m_head->m_pkthdr.len > MHLEN ? m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR) : - m_get(M_DONTWAIT, MT_DATA); + m_gethdr(M_DONTWAIT, MT_DATA); if (m_new == NULL) { m_freem(m_head); printf("xl%d: no memory for tx list\n", sc->xl_unit); ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#29 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.37 2003/02/17 02:19:58 jeff Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.38 2003/03/04 21:03:05 jhb Exp $"; #endif /* not lint */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#46 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19 - * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.56 2003/02/27 02:05:19 julian Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.57 2003/03/04 21:03:05 jhb Exp $ */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/sys/lock.h#26 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/lock.h,v 1.46 2002/08/28 05:14:55 bde Exp $ + * $FreeBSD: src/sys/sys/lock.h,v 1.47 2003/03/04 20:56:39 jhb Exp $ */ #ifndef _SYS_LOCK_H_ ==== //depot/projects/smpng/sys/vm/uma_core.c#26 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/vm/uma_core.c,v 1.49 2003/02/19 05:47:46 imp Exp $ + * $FreeBSD: src/sys/vm/uma_core.c,v 1.50 2003/03/04 21:03:05 jhb Exp $ * */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303042118.h24LIUO5063038>