CVS commit: src/external/ibm-public/postfix/dist
Module Name:src Committed By: tron Date: Tue Dec 18 09:10:32 UTC 2012 Modified Files: src/external/ibm-public/postfix/dist: makedefs src/external/ibm-public/postfix/dist/src/util: sys_defs.h Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/dist/makedefs cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/dist/makedefs diff -u src/external/ibm-public/postfix/dist/makedefs:1.5 src/external/ibm-public/postfix/dist/makedefs:1.6 --- src/external/ibm-public/postfix/dist/makedefs:1.5 Wed Nov 9 19:06:34 2011 +++ src/external/ibm-public/postfix/dist/makedefs Tue Dec 18 09:10:32 2012 @@ -146,6 +146,8 @@ case "$SYSTEM.$RELEASE" in ;; FreeBSD.8*) SYSTYPE=FREEBSD8 ;; + FreeBSD.9*) SYSTYPE=FREEBSD9 + ;; OpenBSD.2*) SYSTYPE=OPENBSD2 ;; OpenBSD.3*) SYSTYPE=OPENBSD3 Index: src/external/ibm-public/postfix/dist/src/util/sys_defs.h diff -u src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.3 src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.4 --- src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.3 Wed Nov 9 19:06:34 2011 +++ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Tue Dec 18 09:10:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_defs.h,v 1.3 2011/11/09 19:06:34 tron Exp $ */ +/* $NetBSD: sys_defs.h,v 1.4 2012/12/18 09:10:32 tron Exp $ */ #ifndef _SYS_DEFS_H_INCLUDED_ #define _SYS_DEFS_H_INCLUDED_ @@ -27,7 +27,7 @@ */ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ -|| defined(FREEBSD8) \ +|| defined(FREEBSD8) || defined(FREEBSD9) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(OPENBSD5) \
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: tron Date: Tue Dec 18 10:59:38 UTC 2012 Modified Files: src/distrib/sets/lists/modules: mi Log Message: Add entries for "cylic" and "profile" modules which are part of DTrace. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.49 src/distrib/sets/lists/modules/mi:1.50 --- src/distrib/sets/lists/modules/mi:1.49 Mon Dec 10 00:32:24 2012 +++ src/distrib/sets/lists/modules/mi Tue Dec 18 10:59:38 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.49 2012/12/10 00:32:24 rmind Exp $ +# $NetBSD: mi,v 1.50 2012/12/18 10:59:38 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -35,6 +35,8 @@ ./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules kmod ./@MODULEDIR@/coredumpbase-kernel-modules kmod ./@MODULEDIR@/coredump/coredump.kmod base-kernel-modules kmod +./@MODULEDIR@/cyclicbase-kernel-modules kmod,dtrace +./@MODULEDIR@/cyclic/cyclic.kmod base-kernel-modules kmod,dtrace ./@MODULEDIR@/dbcoolbase-kernel-modules kmod ./@MODULEDIR@/dbcool/dbcool.kmod base-kernel-modules kmod ./@MODULEDIR@/dirhashbase-obsolete obsolete @@ -141,6 +143,8 @@ ./@MODULEDIR@/ppp_deflate/ppp_deflate.kmod base-kernel-modules kmod ./@MODULEDIR@/procfsbase-kernel-modules kmod ./@MODULEDIR@/procfs/procfs.kmod base-kernel-modules kmod +./@MODULEDIR@/profilebase-kernel-modules kmod,dtrace +./@MODULEDIR@/profile/profile.kmod base-kernel-modules kmod,dtrace ./@MODULEDIR@/ptyfsbase-kernel-modules kmod ./@MODULEDIR@/ptyfs/ptyfs.kmod base-kernel-modules kmod ./@MODULEDIR@/puffsbase-kernel-modules kmod
CVS commit: src/share/man/man8
Module Name:src Committed By: wiz Date: Tue Dec 18 13:14:35 UTC 2012 Modified Files: src/share/man/man8: rc.subr.8 Log Message: Bump date for previous and remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/share/man/man8/rc.subr.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/rc.subr.8 diff -u src/share/man/man8/rc.subr.8:1.30 src/share/man/man8/rc.subr.8:1.31 --- src/share/man/man8/rc.subr.8:1.30 Mon Dec 17 18:17:27 2012 +++ src/share/man/man8/rc.subr.8 Tue Dec 18 13:14:34 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.subr.8,v 1.30 2012/12/17 18:17:27 apb Exp $ +.\" $NetBSD: rc.subr.8,v 1.31 2012/12/18 13:14:34 wiz Exp $ .\" .\" Copyright (c) 2002-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 11, 2011 +.Dd December 17, 2012 .Dt RC.SUBR 8 .Os .Sh NAME @@ -164,7 +164,7 @@ is moved to .Ic basename Ar file Op Ar suffix Just like .Xr basename 1 , -except implemented using shell built-in commands, and usable before the +except implemented using shell built-in commands, and usable before the .Pa /usr/bin direcory is available. .It Ic checkyesno Ar var @@ -227,7 +227,7 @@ to nothing, but leaving other backslashe .Ic dirname Ar file Just like .Xr dirname 1 , -except implemented using shell built-in commands, and usable before the +except implemented using shell built-in commands, and usable before the .Pa /usr/bin direcory is available. .It Ic err Ar exitval Ar message
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Dec 18 13:15:17 UTC 2012 Modified Files: src/share/man/man4: ibmcd.4 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/ibmcd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ibmcd.4 diff -u src/share/man/man4/ibmcd.4:1.1 src/share/man/man4/ibmcd.4:1.2 --- src/share/man/man4/ibmcd.4:1.1 Mon Dec 17 20:37:59 2012 +++ src/share/man/man4/ibmcd.4 Tue Dec 18 13:15:17 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: ibmcd.4,v 1.1 2012/12/17 20:37:59 mbalmer Exp $ +.\" $NetBSD: ibmcd.4,v 1.2 2012/12/18 13:15:17 wiz Exp $ .\" .\" Copyright (c) 2012 Marc Balmer .\" All rights reserved. @@ -53,8 +53,8 @@ There is no need to reset pin 0 to logic a oneshot impulse. .Sh SEE ALSO .Xr gpio 4 , -.Xr gpioctl 8 , -.Xr ptcd 4 +.Xr ptcd 4 , +.Xr gpioctl 8 .Sh HISTORY The .Nm
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Dec 18 13:15:42 UTC 2012 Modified Files: src/share/man/man4: ptcd.4 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/ptcd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ptcd.4 diff -u src/share/man/man4/ptcd.4:1.3 src/share/man/man4/ptcd.4:1.4 --- src/share/man/man4/ptcd.4:1.3 Mon Dec 17 20:39:23 2012 +++ src/share/man/man4/ptcd.4 Tue Dec 18 13:15:42 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: ptcd.4,v 1.3 2012/12/17 20:39:23 mbalmer Exp $ +.\" $NetBSD: ptcd.4,v 1.4 2012/12/18 13:15:42 wiz Exp $ .\" .\" Copyright (c) 2012 Marc Balmer .\" All rights reserved. @@ -47,8 +47,8 @@ is open. To open the cash drawer, set pin 0 to logical 1 for a short period of time (e.g. < 1 sec) and then reset the pin to logical 0. .Sh SEE ALSO -.Xr ibmcd 4 , .Xr gpio 4 , +.Xr ibmcd 4 , .Xr gpioctl 8 .Sh HISTORY The
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: matt
Date: Tue Dec 18 13:41:42 UTC 2012
Added Files:
src/sys/arch/arm/arm: cpu_in_cksum_v4hdr.S
Log Message:
Add a routine to compute the IP checksum of a 20-byte IP header.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S
diff -u /dev/null src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S:1.1
--- /dev/null Tue Dec 18 13:41:42 2012
+++ src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S Tue Dec 18 13:41:42 2012
@@ -0,0 +1,70 @@
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+
+RCSID("$NetBSD: cpu_in_cksum_v4hdr.S,v 1.1 2012/12/18 13:41:42 matt Exp $")
+
+ENTRY(cpu_in_cksum_v4hdr)
+ ldr ip, [r0] /* load 1st word */
+ ldr r3, [r0, #4] /* load 2nd word */
+ adds r3, r3, ip /* add 1st to 2nd */
+ ldr r2, [r0, #8] /* load 3rd word */
+ adcs r2, r2, r3 /* add sum to 3rd */
+ ldr r1, [r0, #12] /* load 4th word */
+ adcs r1, r1, r2 /* add sum to 4th */
+ ldr r0, [r0, #16] /* load 5th word */
+ adcs r0, r0, r1 /* add sum to 5th */
+ /*
+ * We now have a 33-bit (r0 + carry) sum which needs to resolved to a
+ * 16-bit sum.
+ */
+ mov r1, r0, lsr #16 /* get upper halfword */
+#ifdef _ARM_ARCH_6
+ uxth r0, r0 /* clear upper halfword (16bit carry) */
+#else
+ bic r0, r0, #0x00ff /* clear upper halfword (16bit carry) */
+ bic r0, r0, #0xff00 /* clear upper halfword */
+#endif
+ adc r0, r0, r1 /* add halfwords with leftover carry */
+ /*
+ * At this point, we have a sum with a max of 0x1fffe.
+ * If we have a 17-bit value (>= 0x1) then subtract 0x.
+ */
+ cmp r0, #0x1 /* test 16-bit carry */
+#ifdef _ARM_ARCH_7
+ movw r1, #0x /* load 0x */
+#else
+ mov r1, #0x1 /* load 0x1 */
+ sub r1, r1, #1 /* subtract 1 to get 0x */
+#endif
+ subge r0, r0, r1 /* subtract 0x */
+ eor r0, r0, r1 /* complement lower halfword */
+ RET
+END(cpu_in_cksum_v4hdr)
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: matt
Date: Tue Dec 18 14:08:25 UTC 2012
Modified Files:
src/sys/arch/arm/arm: cpu_in_cksum_v4hdr.S
Log Message:
Add ldrd support (one additional instruction over 5 ldrs) but two of them
won't be executed resulting in 2 less loads which should save a few cyles.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S
diff -u src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S:1.1 src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S:1.2
--- src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S:1.1 Tue Dec 18 13:41:42 2012
+++ src/sys/arch/arm/arm/cpu_in_cksum_v4hdr.S Tue Dec 18 14:08:25 2012
@@ -29,18 +29,30 @@
#include
-RCSID("$NetBSD: cpu_in_cksum_v4hdr.S,v 1.1 2012/12/18 13:41:42 matt Exp $")
+RCSID("$NetBSD: cpu_in_cksum_v4hdr.S,v 1.2 2012/12/18 14:08:25 matt Exp $")
ENTRY(cpu_in_cksum_v4hdr)
+#ifdef _ARM_ARCH_DWORD_OK
+ tst r0, #4 /* 64-bit aligned? */
+ ldreqd r2, [r0], #8 /* load 1st/2nd words */
+ ldrne ip, [r0], #4 /* load 1st word */
+ ldreq ip, [r0, #8] /* load 5th word */
+ ldrned r2, [r0, #8] /* load 4th/5th words */
+#else
ldr ip, [r0] /* load 1st word */
ldr r3, [r0, #4] /* load 2nd word */
- adds r3, r3, ip /* add 1st to 2nd */
ldr r2, [r0, #8] /* load 3rd word */
- adcs r2, r2, r3 /* add sum to 3rd */
+#endif
+ adds r3, r3, ip /* accumulate */
+ adcs r2, r2, r3 /* accumulate */
+#ifdef _ARM_ARCH_DWORD_OK
+ ldrd r0, [r0] /* load remaining words */
+#else
ldr r1, [r0, #12] /* load 4th word */
- adcs r1, r1, r2 /* add sum to 4th */
ldr r0, [r0, #16] /* load 5th word */
- adcs r0, r0, r1 /* add sum to 5th */
+#endif
+ adcs r1, r1, r2 /* accumulate */
+ adcs r0, r0, r1 /* accumulate */
/*
* We now have a 33-bit (r0 + carry) sum which needs to resolved to a
* 16-bit sum.
@@ -62,7 +74,7 @@ ENTRY(cpu_in_cksum_v4hdr)
movw r1, #0x /* load 0x */
#else
mov r1, #0x1 /* load 0x1 */
- sub r1, r1, #1 /* subtract 1 to get 0x */
+ sub r1, r1, #1 /* subtract by 1 to get 0x */
#endif
subge r0, r0, r1 /* subtract 0x */
eor r0, r0, r1 /* complement lower halfword */
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Tue Dec 18 19:45:47 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Correct change list for ticket #1819. To generate a diff of this commit: cvs rdiff -u -r1.1.2.203 -r1.1.2.204 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.203 src/doc/CHANGES-5.2:1.1.2.204 --- src/doc/CHANGES-5.2:1.1.2.203 Tue Nov 27 18:52:28 2012 +++ src/doc/CHANGES-5.2 Tue Dec 18 19:45:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.203 2012/11/27 18:52:28 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.204 2012/12/18 19:45:46 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8799,6 +8799,7 @@ distrib/sets/lists/base/mi 1.993 Really mark wake as obsolete [msaitoh] +sys/arch/x86/include/specialreg.h 1.58 sys/arch/x86/x86/identcpu.c 1.31 via patch MSR fixes for VIA CPUs. PR#41267.
CVS commit: [netbsd-5-2] src
Module Name:src Committed By: riz Date: Tue Dec 18 21:55:15 UTC 2012 Modified Files: src/gnu/usr.bin/groff/tmac [netbsd-5-2]: mdoc.local src/sys/sys [netbsd-5-2]: param.h Added Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Welcome to 5.2.0_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.2.1 cvs rdiff -u -r1.43.4.18 -r1.43.4.18.2.1 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.18 -r1.330.4.18.2.1 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.1 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 Tue Nov 27 18:52:27 2012 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Tue Dec 18 21:55:15 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.43.4.18 2012/11/27 18:52:27 riz Exp $ +.\" $NetBSD: mdoc.local,v 1.43.4.18.2.1 2012/12/18 21:55:15 riz Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~5.2 +.ds doc-operating-system NetBSD\~5.2.0_PATCH .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.2 +.ds doc-default-operating-system NetBSD\~5.2.0_PATCH .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.18 src/sys/sys/param.h:1.330.4.18.2.1 --- src/sys/sys/param.h:1.330.4.18 Tue Nov 27 18:52:28 2012 +++ src/sys/sys/param.h Tue Dec 18 21:55:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.18 2012/11/27 18:52:28 riz Exp $ */ +/* $NetBSD: param.h,v 1.330.4.18.2.1 2012/12/18 21:55:15 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50200 /* NetBSD 5.2 */ +#define __NetBSD_Version__ 50200 /* NetBSD 5.2.0_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.2.1 diff -u /dev/null src/doc/CHANGES-5.2.1:1.1.2.1 --- /dev/null Tue Dec 18 21:55:16 2012 +++ src/doc/CHANGES-5.2.1 Tue Dec 18 21:55:15 2012 @@ -0,0 +1,11 @@ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.1 2012/12/18 21:55:15 riz Exp $ + +A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 +release: + +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.2.0_PATCH. + [riz] +
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Tue Dec 18 21:59:29 UTC 2012 Modified Files: src/doc [netbsd-5]: LAST_MINUTE README.files src/gnu/usr.bin/groff/tmac [netbsd-5]: mdoc.local src/sys/sys [netbsd-5]: param.h Added Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Welcome to 5.2_STABLE. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.3 cvs rdiff -u -r1.2.30.3 -r1.2.30.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.4.10.4 -r1.4.10.5 src/doc/README.files cvs rdiff -u -r1.43.4.18 -r1.43.4.19 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.18 -r1.330.4.19 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.30.3 src/doc/LAST_MINUTE:1.2.30.4 --- src/doc/LAST_MINUTE:1.2.30.3 Tue Nov 27 18:52:28 2012 +++ src/doc/LAST_MINUTE Tue Dec 18 21:59:28 2012 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.30.3 2012/11/27 18:52:28 riz Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.30.4 2012/12/18 21:59:28 riz Exp $ -This file contains important information on the NetBSD 5.2 release that +This file contains important information on the NetBSD 5.3 release that did not make it into the main documentation. [all] Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.4 src/doc/README.files:1.4.10.5 --- src/doc/README.files:1.4.10.4 Tue Nov 27 18:52:28 2012 +++ src/doc/README.files Tue Dec 18 21:59:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.4 2012/11/27 18:52:28 riz Exp $ +# $NetBSD: README.files,v 1.4.10.5 2012/12/18 21:59:28 riz Exp $ What's in this directory: @@ -10,6 +10,8 @@ CHANGES-5.1 Changes between the 5.0 and CHANGES-5.2 Changes between the 5.1 and 5.2 releases. +CHANGES-5.2 Changes between the 5.2 and 5.3 releases. + CHANGES.prev Changes in previous NetBSD releases. LAST_MINUTE Last minute changes and notes about the release. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.19 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 Tue Nov 27 18:52:27 2012 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Tue Dec 18 21:59:28 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.43.4.18 2012/11/27 18:52:27 riz Exp $ +.\" $NetBSD: mdoc.local,v 1.43.4.19 2012/12/18 21:59:28 riz Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~5.2 +.ds doc-operating-system NetBSD\~5.2_STABLE .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.2 +.ds doc-default-operating-system NetBSD\~5.2_STABLE .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -59,6 +59,7 @@ .ds doc-operating-system-NetBSD-5.05.0 .ds doc-operating-system-NetBSD-5.15.1 .ds doc-operating-system-NetBSD-5.25.2 +.ds doc-operating-system-NetBSD-5.35.3 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.3 6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.18 src/sys/sys/param.h:1.330.4.19 --- src/sys/sys/param.h:1.330.4.18 Tue Nov 27 18:52:28 2012 +++ src/sys/sys/param.h Tue Dec 18 21:59:28 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.18 2012/11/27 18:52:28 riz Exp $ */ +/* $NetBSD: param.h,v 1.330.4.19 2012/12/18 21:59:28 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50200 /* NetBSD 5.2 */ +#define __NetBSD_Version__ 50200 /* NetBSD 5.2_STABLE */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.3 diff -u /dev/null src/doc/CHANGES-5.3:1.1.2.1 --- /dev/null Tue Dec 18 21:59:29 2012 +++ src/doc/CHANGES-5.3 Tue Dec 18 21:59:28 2012 @@ -0,0 +1,13 @@ +# $NetBSD: CHANGES-5.3,v 1.1.2.1 2012/12/18 21:59:28 riz Exp $ + +A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 +release: + +doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.2_STABLE. + [riz] +
CVS commit: src
Module Name:src Committed By: spz Date: Tue Dec 18 22:45:14 UTC 2012 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/etc/mtree: NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.sparc64 NetBSD.dist.x86_64 Log Message: add entries built for MKDEBUG and MKDEBUGLIB to the set lists Thanks to Hisashi T Fujinaka for pointing out the gap. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.183 -r1.184 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/comp/ad.mips64eb cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.185 -r1.186 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.162 -r1.163 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.242 -r1.243 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.4 -r1.5 src/etc/mtree/NetBSD.dist.mips64eb \ src/etc/mtree/NetBSD.dist.sparc64 src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.5 -r1.6 src/etc/mtree/NetBSD.dist.mips64el Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.107 src/distrib/sets/lists/base/ad.mips64eb:1.108 --- src/distrib/sets/lists/base/ad.mips64eb:1.107 Wed Dec 12 17:47:57 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Tue Dec 18 22:45:12 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.107 2012/12/12 17:47:57 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.108 2012/12/18 22:45:12 spz Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -641,8 +641,10 @@ ./usr/lib/o32/security/pam_unix.so.3 base-compat-shlib compat,pic,pam ./usr/libdata/debug/usr/lib/64 base-compat-lib compat ./usr/libdata/debug/usr/lib/64/i18n base-compat-lib compat +./usr/libdata/debug/usr/lib/64/npf base-compat-lib compat ./usr/libdata/debug/usr/lib/o32 base-compat-lib compat ./usr/libdata/debug/usr/lib/o32/i18n base-compat-lib compat +./usr/libdata/debug/usr/lib/o32/npf base-compat-lib compat ./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic ./usr/libexec/ld.elf_so-o32 base-sysutil-bin compat,pic ./usr/lkm/ldscriptbase-obsolete obsolete Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.107 src/distrib/sets/lists/base/ad.mips64el:1.108 --- src/distrib/sets/lists/base/ad.mips64el:1.107 Wed Dec 12 17:47:58 2012 +++ src/distrib/sets/lists/base/ad.mips64el Tue Dec 18 22:45:12 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.107 2012/12/12 17:47:58 christos Exp $ +# $NetBSD: ad.mips64el,v 1.108 2012/12/18 22:45:12 spz Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -641,8 +641,10 @@ ./usr/lib/o32/security/pam_unix.so.3 base-compat-shlib compat,pic,pam ./usr/libdata/debug/usr/lib/64 base-compat-lib compat ./usr/libdata/debug/usr/lib/64/i18n base-compat-lib compat +./usr/libdata/debug/usr/lib/64/npf base-compat-lib compat ./usr/libdata/debug/usr/lib/o32 base-compat-lib compat ./usr/libdata/debug/usr/lib/o32/i18n base-compat-lib compat +./usr/libdata/debug/usr/lib/o32/npf base-compat-lib compat ./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic ./usr/libexec/ld.elf_so-o32 base-sysutil-bin compat,pic ./usr/lkm/ldscriptbase-obsolete obsolete Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.183 src/distrib/sets/lists/base/md.amd64:1.184 --- src/distrib/sets/lists/base/md.amd64:1.183 Wed Dec 12 17:47:58 2012 +++ src/distrib/sets/lists/base/md.amd64 Tue Dec 18 22:45:12 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.183 2012/12/12 17:47:58 christos Exp $ +# $NetBSD: md.amd64,v 1.184 2012/12/18 22:45:12 spz Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -331,6 +331,7 @@ ./usr/lib/libx86_64.so.0.0 base-sys-shlib pic ./usr/libdata/debug/usr/lib/i386 base-compat-lib compat ./usr/libdata/debug/usr/lib/i386/i18n base-compat-lib compat +./usr/libdata/debug/usr/lib/i386/npf base-compat-lib compat ./usr/libexec/ld.elf_so-i386 base-sys-shlib compat,pic ./usr/lkm/aps.o base-obsolete obsolete ./usr/lkm/compat_linux.o base-obsolete obsolete Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.172 src/distrib/sets/lists/base/md.sparc64:1.1
CVS commit: src/doc
Module Name:src Committed By: tron Date: Tue Dec 18 23:25:40 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Fix typo in last entry. To generate a diff of this commit: cvs rdiff -u -r1.1769 -r1.1770 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1769 src/doc/CHANGES:1.1770 --- src/doc/CHANGES:1.1769 Mon Dec 17 20:41:36 2012 +++ src/doc/CHANGES Tue Dec 18 23:25:39 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1769 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1770 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -157,5 +157,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: ptcd(4): Add a driver for the Protech PS3100 cash drawer port. [mbalmer 20121216] ibmcd(4): Add a driver for the IBM 4810 BSP cash drawer port. - [nbalmer 20121217] + [mbalmer 20121217]
CVS commit: src/doc
Module Name:src Committed By: tron Date: Tue Dec 18 23:26:05 UTC 2012 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of Postfix 2.8.13. To generate a diff of this commit: cvs rdiff -u -r1.990 -r1.991 src/doc/3RDPARTY cvs rdiff -u -r1.1770 -r1.1771 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.990 src/doc/3RDPARTY:1.991 --- src/doc/3RDPARTY:1.990 Sun Dec 16 00:54:36 2012 +++ src/doc/3RDPARTY Tue Dec 18 23:26:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.990 2012/12/16 00:54:36 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.991 2012/12/18 23:26:05 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -990,7 +990,7 @@ formatting in man pages, disallowing flo and more. Package: Postfix -Version: 2.8.12 +Version: 2.8.13 Current Vers: 2.8.13/2.9.5 Maintainer: Wietse Venema Archive Site: ftp://postfix.cloud9.net/official/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1770 src/doc/CHANGES:1.1771 --- src/doc/CHANGES:1.1770 Tue Dec 18 23:25:39 2012 +++ src/doc/CHANGES Tue Dec 18 23:26:05 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1770 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1771 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -158,4 +158,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [mbalmer 20121216] ibmcd(4): Add a driver for the IBM 4810 BSP cash drawer port. [mbalmer 20121217] - + postfix(1): Import version 2.8.13 [tron 20121218]
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: matt
Date: Wed Dec 19 02:44:39 UTC 2012
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_eth.c
Log Message:
Use max_linkhdr to determine what rcvoffset to program.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/broadcom/bcm53xx_eth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.18 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.19
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.18 Fri Dec 7 22:21:03 2012
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Wed Dec 19 02:44:39 2012
@@ -35,7 +35,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.18 2012/12/07 22:21:03 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.19 2012/12/19 02:44:39 matt Exp $");
#include
#include
@@ -71,7 +71,6 @@ __KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.
#endif
#define BCMETH_EVCNT_INCR(a) BCMETH_EVCNT_ADD((a), 1)
-#define BCMETH_RCVOFFSET 10
#define BCMETH_MAXTXMBUFS 128
#define BCMETH_NTXSEGS 30
#define BCMETH_MAXRXMBUFS 255
@@ -79,7 +78,7 @@ __KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.
#define BCMETH_NRXSEGS 1
#define BCMETH_RINGSIZE PAGE_SIZE
-#if 0
+#if 1
#define BCMETH_RCVMAGIC 0xfeedface
#endif
@@ -148,6 +147,7 @@ struct bcmeth_softc {
struct bcmeth_rxqueue sc_rxq;
struct bcmeth_txqueue sc_txq;
+ size_t sc_rcvoffset;
uint32_t sc_maxfrm;
uint32_t sc_cmdcfg;
uint32_t sc_intmask;
@@ -434,7 +434,7 @@ bcmeth_macaddr_create(const uint8_t *ena
return (enaddr[3] << 0) // UNIMAC_MAC_0
| (enaddr[2] << 8) // UNIMAC_MAC_0
| (enaddr[1] << 16) // UNIMAC_MAC_0
- | (enaddr[0] << 24) // UNIMAC_MAC_0
+ | ((uint64_t)enaddr[0] << 24) // UNIMAC_MAC_0
| ((uint64_t)enaddr[5] << 32) // UNIMAC_MAC_1
| ((uint64_t)enaddr[4] << 40); // UNIMAC_MAC_1
}
@@ -457,6 +457,21 @@ bcmeth_ifinit(struct ifnet *ifp)
bcmeth_ifstop(ifp, 0);
/*
+ * Reserve enough space at the front so that we can insert a maxsized
+ * link header and a VLAN tag. Also make sure we have enough room for
+ * the rcvsts field as well.
+ */
+ KASSERT(ALIGN(max_linkhdr) == max_linkhdr);
+ KASSERTMSG(max_linkhdr > sizeof(struct ether_header), "%u > %zu",
+ max_linkhdr, sizeof(struct ether_header));
+ sc->sc_rcvoffset = max_linkhdr + 4 - sizeof(struct ether_header);
+ if (sc->sc_rcvoffset <= 4)
+ sc->sc_rcvoffset += 4;
+ KASSERT((sc->sc_rcvoffset & 3) == 2);
+ KASSERT(sc->sc_rcvoffset <= __SHIFTOUT(RCVCTL_RCVOFFSET, RCVCTL_RCVOFFSET));
+ KASSERT(sc->sc_rcvoffset >= 6);
+
+ /*
* If our frame size has changed (or it's our first time through)
* destroy the existing transmit mapcache.
*/
@@ -492,7 +507,7 @@ bcmeth_ifinit(struct ifnet *ifp)
bcmeth_rxq_reset(sc, &sc->sc_rxq);
bcmeth_write_4(sc, sc->sc_rxq.rxq_reg_rcvctl,
- __SHIFTIN(BCMETH_RCVOFFSET, RCVCTL_RCVOFFSET)
+ __SHIFTIN(sc->sc_rcvoffset, RCVCTL_RCVOFFSET)
| RCVCTL_PARITY_DIS
| RCVCTL_OFLOW_CONTINUE
| __SHIFTIN(3, RCVCTL_BURSTLEN));
@@ -958,7 +973,7 @@ bcmeth_rx_input(
bcmeth_rx_map_unload(sc, m);
- m_adj(m, BCMETH_RCVOFFSET);
+ m_adj(m, sc->sc_rcvoffset);
switch (__SHIFTOUT(rxdb_flags, RXSTS_PKTTYPE)) {
case RXSTS_PKTTYPE_UC:
@@ -1091,7 +1106,7 @@ bcmeth_rxq_consume(
} while (m);
} else {
uint32_t framelen = __SHIFTOUT(rxsts, RXSTS_FRAMELEN);
- framelen += BCMETH_RCVOFFSET;
+ framelen += sc->sc_rcvoffset;
m->m_pkthdr.len = framelen;
if (desc_count == 1) {
KASSERT(framelen <= MCLBYTES);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Dec 19 05:50:06 UTC 2012
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
space change.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.82 src/sys/dev/pci/pucdata.c:1.83
--- src/sys/dev/pci/pucdata.c:1.82 Thu Oct 18 10:41:44 2012
+++ src/sys/dev/pci/pucdata.c Wed Dec 19 05:50:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.82 2012/10/18 10:41:44 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.83 2012/12/19 05:50:06 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.82 2012/10/18 10:41:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.83 2012/12/19 05:50:06 msaitoh Exp $");
#include
#include
@@ -2581,7 +2581,7 @@ const struct puc_device_description puc_
},
},
{ "VScom PCI-200H",
-{ PCI_VENDOR_TITAN, PCI_PRODUCT_TITAN_VSCOM_PCI200H, 0, 0 },
+ { PCI_VENDOR_TITAN, PCI_PRODUCT_TITAN_VSCOM_PCI200H, 0, 0 },
{ 0x, 0x, 0, 0 },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: msaitoh
Date: Wed Dec 19 05:52:00 UTC 2012
Modified Files:
src/sys/arch/x86/pci: ichlpcib.c
Log Message:
Add Intel 7 series' LPC devices.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x86/pci/ichlpcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.36 src/sys/arch/x86/pci/ichlpcib.c:1.37
--- src/sys/arch/x86/pci/ichlpcib.c:1.36 Thu Dec 6 12:50:09 2012
+++ src/sys/arch/x86/pci/ichlpcib.c Wed Dec 19 05:52:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.36 2012/12/06 12:50:09 msaitoh Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.37 2012/12/19 05:52:00 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.36 2012/12/06 12:50:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.37 2012/12/19 05:52:00 msaitoh Exp $");
#include
#include
@@ -233,6 +233,20 @@ static struct lpcib_device {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_QM67_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_QS67_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_UM67_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_B75_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_H77_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MOBILE_HM70_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MOBILE_HM75_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MOBILE_HM76_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MOBILE_HM77_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MOBILE_QM77_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MOBILE_QS77_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MOBILE_UM77_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_NM70_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Q75_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Q77_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z75_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z77_LPC, 1, 0 },
{ 0, 0, 0, 0 },
};
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: msaitoh Date: Wed Dec 19 07:54:42 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: BCM5301X BEAGLEBOARD BEAGLEBOARDXM BEAGLEBONE IGEPV2 PANDABOARD Log Message: Add pseudo-device lockstat To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/BCM5301X cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/BEAGLEBOARD cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/BEAGLEBOARDXM cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/BEAGLEBONE \ src/sys/arch/evbarm/conf/PANDABOARD cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/IGEPV2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/BCM5301X diff -u src/sys/arch/evbarm/conf/BCM5301X:1.9 src/sys/arch/evbarm/conf/BCM5301X:1.10 --- src/sys/arch/evbarm/conf/BCM5301X:1.9 Wed Oct 17 20:22:23 2012 +++ src/sys/arch/evbarm/conf/BCM5301X Wed Dec 19 07:54:42 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: BCM5301X,v 1.9 2012/10/17 20:22:23 matt Exp $ +# $NetBSD: BCM5301X,v 1.10 2012/12/19 07:54:42 msaitoh Exp $ # # BCM5301X -- Broadcom BCM5301X Eval Board Kernel # @@ -283,3 +283,4 @@ pseudo-device pty # pseudo-terminals #pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms pseudo-device drvctl # device control +pseudo-device lockstat # lock profiling Index: src/sys/arch/evbarm/conf/BEAGLEBOARD diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.34 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.35 --- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.34 Thu Dec 13 01:24:11 2012 +++ src/sys/arch/evbarm/conf/BEAGLEBOARD Wed Dec 19 07:54:42 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: BEAGLEBOARD,v 1.34 2012/12/13 01:24:11 matt Exp $ +# $NetBSD: BEAGLEBOARD,v 1.35 2012/12/19 07:54:42 msaitoh Exp $ # # BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel # @@ -316,3 +316,4 @@ pseudo-device pty # pseudo-terminals #options RND_COM #pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms +pseudo-device lockstat # lock profiling Index: src/sys/arch/evbarm/conf/BEAGLEBOARDXM diff -u src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.7 src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.8 --- src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.7 Wed Oct 17 14:48:11 2012 +++ src/sys/arch/evbarm/conf/BEAGLEBOARDXM Wed Dec 19 07:54:42 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: BEAGLEBOARDXM,v 1.7 2012/10/17 14:48:11 apb Exp $ +# $NetBSD: BEAGLEBOARDXM,v 1.8 2012/12/19 07:54:42 msaitoh Exp $ # # BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel # @@ -296,3 +296,4 @@ pseudo-device pty # pseudo-terminals #options RND_COM #pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms +pseudo-device lockstat # lock profiling Index: src/sys/arch/evbarm/conf/BEAGLEBONE diff -u src/sys/arch/evbarm/conf/BEAGLEBONE:1.4 src/sys/arch/evbarm/conf/BEAGLEBONE:1.5 --- src/sys/arch/evbarm/conf/BEAGLEBONE:1.4 Tue Dec 11 19:29:29 2012 +++ src/sys/arch/evbarm/conf/BEAGLEBONE Wed Dec 19 07:54:42 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: BEAGLEBONE,v 1.4 2012/12/11 19:29:29 riastradh Exp $ +# $NetBSD: BEAGLEBONE,v 1.5 2012/12/19 07:54:42 msaitoh Exp $ # # BEAGLEBONE -- TI AM335x board Kernel # @@ -311,3 +311,4 @@ pseudo-device pty # pseudo-terminals #options RND_COM #pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms +pseudo-device lockstat # lock profiling Index: src/sys/arch/evbarm/conf/PANDABOARD diff -u src/sys/arch/evbarm/conf/PANDABOARD:1.4 src/sys/arch/evbarm/conf/PANDABOARD:1.5 --- src/sys/arch/evbarm/conf/PANDABOARD:1.4 Wed Oct 17 14:48:11 2012 +++ src/sys/arch/evbarm/conf/PANDABOARD Wed Dec 19 07:54:41 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: PANDABOARD,v 1.4 2012/10/17 14:48:11 apb Exp $ +# $NetBSD: PANDABOARD,v 1.5 2012/12/19 07:54:41 msaitoh Exp $ # # PANDABOARD -- TI OMAP 4430 Eval Board Kernel # @@ -298,3 +298,4 @@ pseudo-device pty # pseudo-terminals #options RND_COM #pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms +pseudo-device lockstat # lock profiling Index: src/sys/arch/evbarm/conf/IGEPV2 diff -u src/sys/arch/evbarm/conf/IGEPV2:1.13 src/sys/arch/evbarm/conf/IGEPV2:1.14 --- src/sys/arch/evbarm/conf/IGEPV2:1.13 Tue Sep 11 19:43:09 2012 +++ src/sys/arch/evbarm/conf/IGEPV2 Wed Dec 19 07:54:41 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: IGEPV2,v 1.13 2012/09/11 19:43:09 msaitoh Exp $ +# $NetBSD: IGEPV2,v 1.14 2012/12/19 07:54:41 msaitoh Exp $ # # IGEPv2 -- TI OMAP 3530 Eval Board Kernel # @@ -284,3 +284,4 @@ pseudo-device pty # pseudo-terminals #options RND_COM #pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms +pseudo-device lockstat # lock profiling
