Re: CVS commit: src/sys
On Sun, Jun 03, 2012 at 10:10:40AM +0900, Izumi Tsutsui wrote: dsl@ wrote: ... } Log Message: } Remove the code that tries to load the ffs kernel module during boot. } This is in line with the core decision than even modular kernels should } contain the ffs code. } I've left in the code that tries to load nfs and ext2fs, but it } isn't clear that is necessary. } Removes a warning message that (usually) flashes past to fast to read. } AFAICT all the relevant kernels contain ffs (and nfs for that matter). ... Can't we have an option for autoloading rootfs modules, like console settings configurable via installboot? You can request it from the boot.cfg file, there is no need for a second way - it only confuses things. David -- David Laight: da...@l8s.co.uk
Re: CVS commit: src/tools/compat
On Sun, 03 Jun 2012, Joerg Sonnenberger wrote: Log Message: Add __predict_true / __predict_false definitions. +#undef __predict_false +#define __predict_false(x) x +#undef __predict_true +#define __predict_true(x) x Please parenthesise the definitions. I don't know whether it's worth defining them in a compiler-dependent way, or using #ifndef to pick up any definition provided by the host system. --apb (Alan Barrett)
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:16:33 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Add entry for #1762. To generate a diff of this commit: cvs rdiff -u -r1.1.2.168 -r1.1.2.169 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.168 src/doc/CHANGES-5.2:1.1.2.169 --- src/doc/CHANGES-5.2:1.1.2.168 Tue May 22 21:46:56 2012 +++ src/doc/CHANGES-5.2 Sun Jun 3 08:16:32 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.168 2012/05/22 21:46:56 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.169 2012/06/03 08:16:32 jdc Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6402,6 +6402,11 @@ libexec/ld.elf_so/arch/hppa/hppa_reloc.c Fix hppa problem introduced by ticket #1724. [skrll, ticket #1761] +crypto/dist/openssl/ssl/d1_enc.c patch + + Address CVE-2012-2333. + [drochner, ticket #1762] + sys/ufs/ufs/ufs_vnops.cpatch Fix error from ticket #1759 and avoid a panic.
CVS commit: [netbsd-5] src
Module Name:src Committed By: jdc Date: Sun Jun 3 08:45:51 UTC 2012 Modified Files: src/distrib/sets/lists/base [netbsd-5]: rescue.mi src/rescue [netbsd-5]: list Log Message: Pull up revisions: src/distrib/sets/lists/base/rescue.mi revision 1.34 src/rescue/list revision 1.43 (requested by jnemeth in ticket #1764). PR/46393 - Nat Sloss -- add gpt(8) to /rescue To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.12.1 src/distrib/sets/lists/base/rescue.mi cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/rescue/list 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/rescue.mi diff -u src/distrib/sets/lists/base/rescue.mi:1.27 src/distrib/sets/lists/base/rescue.mi:1.27.12.1 --- src/distrib/sets/lists/base/rescue.mi:1.27 Thu Jan 3 20:47:57 2008 +++ src/distrib/sets/lists/base/rescue.mi Sun Jun 3 08:45:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: rescue.mi,v 1.27 2008/01/03 20:47:57 jdc Exp $ +# $NetBSD: rescue.mi,v 1.27.12.1 2012/06/03 08:45:50 jdc Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -46,6 +46,7 @@ ./rescue/fsdb base-rescue-root ./rescue/fsirandbase-rescue-root ./rescue/ftp base-rescue-root +./rescue/gpt base-rescue-root ./rescue/grep base-rescue-root ./rescue/gunzip base-rescue-root ./rescue/gzcat base-rescue-root Index: src/rescue/list diff -u src/rescue/list:1.33.2.1 src/rescue/list:1.33.2.2 --- src/rescue/list:1.33.2.1 Fri Jan 16 22:21:30 2009 +++ src/rescue/list Sun Jun 3 08:45:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.33.2.1 2009/01/16 22:21:30 bouyer Exp $ +# $NetBSD: list,v 1.33.2.2 2012/06/03 08:45:50 jdc Exp $ SRCDIRS bin @@ -59,6 +59,7 @@ PROG fsck_lfs PROG fsck_msdos PROG fsdb PROG fsirand +PROG gpt PROG ifconfig PROG init init.bak PROG lmcconfig
CVS commit: [netbsd-5] src/sys/arch/x68k/x68k
Module Name:src Committed By: jdc Date: Sun Jun 3 08:46:36 UTC 2012 Modified Files: src/sys/arch/x68k/x68k [netbsd-5]: clock.c Log Message: Pull up revision 1.34 (requested by isaki in ticket #1765). With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) in Timer-D. It fixes the clock ticked faster when timecounter uses mfp (as default choice). It was introduced in rev 1.24 in 2006. Thanks tsutsui@ for many comments. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.6.1 src/sys/arch/x68k/x68k/clock.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/x68k/x68k/clock.c diff -u src/sys/arch/x68k/x68k/clock.c:1.28 src/sys/arch/x68k/x68k/clock.c:1.28.6.1 --- src/sys/arch/x68k/x68k/clock.c:1.28 Wed Jun 25 08:14:59 2008 +++ src/sys/arch/x68k/x68k/clock.c Sun Jun 3 08:46:36 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.28 2008/06/25 08:14:59 isaki Exp $ */ +/* $NetBSD: clock.c,v 1.28.6.1 2012/06/03 08:46:36 jdc Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -77,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.28 2008/06/25 08:14:59 isaki Exp $); +__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.28.6.1 2012/06/03 08:46:36 jdc Exp $); #include clock.h @@ -182,7 +182,7 @@ cpu_initclocks(void) mfp_set_tcdr(CLOCKS_PER_SEC / hz); mfp_bit_set_ierb(MFP_INTR_TIMER_C); - mfp_set_tddr(0xff); /* maximum free run -- only 8 bits wide */ + mfp_set_tddr(0); /* maximum free run -- only 8 bits wide */ mfp_set_tcdcr(mfp_get_tcdcr() | 0x07); /* 1/200 prescaler */ tc_init(tc);
CVS commit: [netbsd-5-0] src/sys/arch/x68k/x68k
Module Name:src Committed By: jdc Date: Sun Jun 3 08:46:40 UTC 2012 Modified Files: src/sys/arch/x68k/x68k [netbsd-5-0]: clock.c Log Message: Pull up revision 1.34 (requested by isaki in ticket #1765). With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) in Timer-D. It fixes the clock ticked faster when timecounter uses mfp (as default choice). It was introduced in rev 1.24 in 2006. Thanks tsutsui@ for many comments. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/arch/x68k/x68k/clock.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/x68k/x68k/clock.c diff -u src/sys/arch/x68k/x68k/clock.c:1.28 src/sys/arch/x68k/x68k/clock.c:1.28.10.1 --- src/sys/arch/x68k/x68k/clock.c:1.28 Wed Jun 25 08:14:59 2008 +++ src/sys/arch/x68k/x68k/clock.c Sun Jun 3 08:46:40 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.28 2008/06/25 08:14:59 isaki Exp $ */ +/* $NetBSD: clock.c,v 1.28.10.1 2012/06/03 08:46:40 jdc Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -77,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.28 2008/06/25 08:14:59 isaki Exp $); +__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.28.10.1 2012/06/03 08:46:40 jdc Exp $); #include clock.h @@ -182,7 +182,7 @@ cpu_initclocks(void) mfp_set_tcdr(CLOCKS_PER_SEC / hz); mfp_bit_set_ierb(MFP_INTR_TIMER_C); - mfp_set_tddr(0xff); /* maximum free run -- only 8 bits wide */ + mfp_set_tddr(0); /* maximum free run -- only 8 bits wide */ mfp_set_tcdcr(mfp_get_tcdcr() | 0x07); /* 1/200 prescaler */ tc_init(tc);
CVS commit: [netbsd-5-1] src/sys/arch/x68k/x68k
Module Name:src Committed By: jdc Date: Sun Jun 3 08:46:43 UTC 2012 Modified Files: src/sys/arch/x68k/x68k [netbsd-5-1]: clock.c Log Message: Pull up revision 1.34 (requested by isaki in ticket #1765). With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) in Timer-D. It fixes the clock ticked faster when timecounter uses mfp (as default choice). It was introduced in rev 1.24 in 2006. Thanks tsutsui@ for many comments. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.14.1 src/sys/arch/x68k/x68k/clock.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/x68k/x68k/clock.c diff -u src/sys/arch/x68k/x68k/clock.c:1.28 src/sys/arch/x68k/x68k/clock.c:1.28.14.1 --- src/sys/arch/x68k/x68k/clock.c:1.28 Wed Jun 25 08:14:59 2008 +++ src/sys/arch/x68k/x68k/clock.c Sun Jun 3 08:46:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.28 2008/06/25 08:14:59 isaki Exp $ */ +/* $NetBSD: clock.c,v 1.28.14.1 2012/06/03 08:46:43 jdc Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -77,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.28 2008/06/25 08:14:59 isaki Exp $); +__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.28.14.1 2012/06/03 08:46:43 jdc Exp $); #include clock.h @@ -182,7 +182,7 @@ cpu_initclocks(void) mfp_set_tcdr(CLOCKS_PER_SEC / hz); mfp_bit_set_ierb(MFP_INTR_TIMER_C); - mfp_set_tddr(0xff); /* maximum free run -- only 8 bits wide */ + mfp_set_tddr(0); /* maximum free run -- only 8 bits wide */ mfp_set_tcdcr(mfp_get_tcdcr() | 0x07); /* 1/200 prescaler */ tc_init(tc);
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: jdc
Date: Sun Jun 3 08:47:28 UTC 2012
Modified Files:
src/sys/kern [netbsd-5]: uipc_usrreq.c
Log Message:
Pull up revision 1.137 (requested by martin in ticket #1766).
Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors
via SCM_RIGHT anxiliary socket messages.
To generate a diff of this commit:
cvs rdiff -u -r1.119.4.4 -r1.119.4.5 src/sys/kern/uipc_usrreq.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/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.119.4.4 src/sys/kern/uipc_usrreq.c:1.119.4.5
--- src/sys/kern/uipc_usrreq.c:1.119.4.4 Sat Jun 18 16:42:04 2011
+++ src/sys/kern/uipc_usrreq.c Sun Jun 3 08:47:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.119.4.4 2011/06/18 16:42:04 bouyer Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.119.4.5 2012/06/03 08:47:28 jdc Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.119.4.4 2011/06/18 16:42:04 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.119.4.5 2012/06/03 08:47:28 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1356,7 +1356,10 @@ unp_internalize(struct mbuf **controlp)
error = EAGAIN;
goto out;
}
- if ((fp = fd_getfile(fd)) == NULL) {
+ if ((fp = fd_getfile(fd)) == NULL
+ || fp-f_type == DTYPE_KQUEUE) {
+ if (fp)
+ fd_putfile(fd);
atomic_dec_uint(unp_rights);
nfds = i;
error = EBADF;
CVS commit: [netbsd-5-1] src/sys/kern
Module Name:src
Committed By: jdc
Date: Sun Jun 3 08:47:36 UTC 2012
Modified Files:
src/sys/kern [netbsd-5-1]: uipc_usrreq.c
Log Message:
Pull up revision 1.137 (requested by martin in ticket #1766).
Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors
via SCM_RIGHT anxiliary socket messages.
To generate a diff of this commit:
cvs rdiff -u -r1.119.4.3 -r1.119.4.3.2.1 src/sys/kern/uipc_usrreq.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/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.119.4.3 src/sys/kern/uipc_usrreq.c:1.119.4.3.2.1
--- src/sys/kern/uipc_usrreq.c:1.119.4.3 Sun Nov 8 21:47:45 2009
+++ src/sys/kern/uipc_usrreq.c Sun Jun 3 08:47:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.119.4.3 2009/11/08 21:47:45 snj Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.119.4.3.2.1 2012/06/03 08:47:35 jdc Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.119.4.3 2009/11/08 21:47:45 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.119.4.3.2.1 2012/06/03 08:47:35 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1326,7 +1326,10 @@ unp_internalize(struct mbuf **controlp)
error = EAGAIN;
goto out;
}
- if ((fp = fd_getfile(fd)) == NULL) {
+ if ((fp = fd_getfile(fd)) == NULL
+ || fp-f_type == DTYPE_KQUEUE) {
+ if (fp)
+ fd_putfile(fd);
atomic_dec_uint(unp_rights);
nfds = i;
error = EBADF;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:48:21 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1764, 1765, 1766. To generate a diff of this commit: cvs rdiff -u -r1.1.2.169 -r1.1.2.170 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.169 src/doc/CHANGES-5.2:1.1.2.170 --- src/doc/CHANGES-5.2:1.1.2.169 Sun Jun 3 08:16:32 2012 +++ src/doc/CHANGES-5.2 Sun Jun 3 08:48:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.169 2012/06/03 08:16:32 jdc Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.170 2012/06/03 08:48:20 jdc Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6412,3 +6412,20 @@ sys/ufs/ufs/ufs_vnops.cpatch Fix error from ticket #1759 and avoid a panic. [buhrow, ticket #1763] +distrib/sets/lists/base/rescue.mi 1.34 +rescue/list 1.43 + PR/46393 - Nat Sloss -- add gpt(8) to /rescue + [jnemeth, ticket #1764] + +sys/arch/x68k/x68k/clock.c 1.34 + With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) + in Timer-D. It fixes the clock ticked faster when timecounter uses + mfp (as default choice). It was introduced in rev 1.24 in 2006. + Thanks tsutsui@ for many comments. + [isaki, ticket #1765] + +sys/kern/uipc_usrreq.c1.137 + Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors + via SCM_RIGHT anxiliary socket messages. + [martin, ticket #1766] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:48:22 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Tickets 1765 and 1766. To generate a diff of this commit: cvs rdiff -u -r1.1.2.74 -r1.1.2.75 src/doc/CHANGES-5.0.3 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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.74 src/doc/CHANGES-5.0.3:1.1.2.75 --- src/doc/CHANGES-5.0.3:1.1.2.74 Tue May 22 18:53:10 2012 +++ src/doc/CHANGES-5.0.3 Sun Jun 3 08:48:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.74 2012/05/22 18:53:10 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.75 2012/06/03 08:48:22 jdc Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -3028,3 +3028,15 @@ crypto/dist/openssl/ssl/d1_enc.c patch Address CVE-2012-2333. [drochner, ticket #1762] +sys/arch/x68k/x68k/clock.c 1.34 + With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) + in Timer-D. It fixes the clock ticked faster when timecounter uses + mfp (as default choice). It was introduced in rev 1.24 in 2006. + Thanks tsutsui@ for many comments. + [isaki, ticket #1765] + +sys/kern/uipc_usrreq.c1.137 + Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors + via SCM_RIGHT anxiliary socket messages. + [martin, ticket #1766] +
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:48:25 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Tickets 1765 and 1766. To generate a diff of this commit: cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-5.1.3 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.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.15 src/doc/CHANGES-5.1.3:1.1.2.16 --- src/doc/CHANGES-5.1.3:1.1.2.15 Tue May 22 18:54:15 2012 +++ src/doc/CHANGES-5.1.3 Sun Jun 3 08:48:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.15 2012/05/22 18:54:15 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.16 2012/06/03 08:48:25 jdc Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -114,3 +114,15 @@ crypto/dist/openssl/ssl/d1_enc.c patch Address CVE-2012-2333. [drochner, ticket #1762] +sys/arch/x68k/x68k/clock.c 1.34 + With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) + in Timer-D. It fixes the clock ticked faster when timecounter uses + mfp (as default choice). It was introduced in rev 1.24 in 2006. + Thanks tsutsui@ for many comments. + [isaki, ticket #1765] + +sys/kern/uipc_usrreq.c1.137 + Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors + via SCM_RIGHT anxiliary socket messages. + [martin, ticket #1766] +
CVS commit: [jmcneill-usbmp] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Jun 3 09:34:04 UTC 2012 Modified Files: src/sys/dev/usb [jmcneill-usbmp]: TODO.usbmp Log Message: Note a working driver. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/sys/dev/usb/TODO.usbmp 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/usb/TODO.usbmp diff -u src/sys/dev/usb/TODO.usbmp:1.1.2.14 src/sys/dev/usb/TODO.usbmp:1.1.2.15 --- src/sys/dev/usb/TODO.usbmp:1.1.2.14 Sat Jun 2 08:07:25 2012 +++ src/sys/dev/usb/TODO.usbmp Sun Jun 3 09:34:04 2012 @@ -1,4 +1,4 @@ -$NetBSD: TODO.usbmp,v 1.1.2.14 2012/06/02 08:07:25 mrg Exp $ +$NetBSD: TODO.usbmp,v 1.1.2.15 2012/06/03 09:34:04 skrll Exp $ the majority of the USB MP device interface is documented in usbdivar.h. @@ -171,7 +171,7 @@ ucom attachments: - uipaq - umct - uplcom attaches ok - - uslsa + - uslsa working - uvscom - moscom - uvisor
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: dsl Date: Sun Jun 3 10:45:11 UTC 2012 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: Fix build now that sysctl_createv() checks its arg type. To generate a diff of this commit: cvs rdiff -u -r1.240 -r1.241 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.240 src/sys/rump/librump/rumpkern/rump.c:1.241 --- src/sys/rump/librump/rumpkern/rump.c:1.240 Sat Feb 4 10:02:25 2012 +++ src/sys/rump/librump/rumpkern/rump.c Sun Jun 3 10:45:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.240 2012/02/04 10:02:25 njoly Exp $ */ +/* $NetBSD: rump.c,v 1.241 2012/06/03 10:45:10 dsl Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.240 2012/02/04 10:02:25 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.241 2012/06/03 10:45:10 dsl Exp $); #include sys/systm.h #define ELFSIZE ARCH_ELFSIZE @@ -180,7 +180,7 @@ mksysctls(void) sysctl_createv(NULL, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_STRING, hostname, SYSCTL_DESCR(System hostname), NULL, 0, - hostname, MAXHOSTNAMELEN, CTL_KERN, KERN_HOSTNAME, CTL_EOL); + hostname, MAXHOSTNAMELEN, CTL_KERN, KERN_HOSTNAME, CTL_EOL); } /* there's no convenient kernel entry point for this, so just craft out own */
CVS commit: src/external/cddl/osnet/dist/lib/libzfs/common
Module Name:src
Committed By: dsl
Date: Sun Jun 3 10:53:52 UTC 2012
Modified Files:
src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_sendrecv.c
Log Message:
Not sure why this has just started to fail!
But it really isn't a good idea to compare a uint64_t to NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c
diff -u src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c:1.1.1.2 src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c:1.2
--- src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c:1.1.1.2 Sat Feb 27 22:30:28 2010
+++ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c Sun Jun 3 10:53:51 2012
@@ -2245,7 +2245,7 @@ zfs_receive_one(libzfs_handle_t *hdl, in
(void) printf(found clone origin %s\n, zc.zc_string);
}
- stream_wantsnewfs = (drrb-drr_fromguid == NULL ||
+ stream_wantsnewfs = (drrb-drr_fromguid == 0 ||
(drrb-drr_flags DRR_FLAG_CLONE));
if (stream_wantsnewfs) {
CVS commit: src/tests/modules/k_helper
Module Name:src Committed By: dsl Date: Sun Jun 3 10:59:44 UTC 2012 Modified Files: src/tests/modules/k_helper: k_helper.c Log Message: Fix build - delete extra To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/modules/k_helper/k_helper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/modules/k_helper/k_helper.c diff -u src/tests/modules/k_helper/k_helper.c:1.5 src/tests/modules/k_helper/k_helper.c:1.6 --- src/tests/modules/k_helper/k_helper.c:1.5 Wed Nov 3 16:10:23 2010 +++ src/tests/modules/k_helper/k_helper.c Sun Jun 3 10:59:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: k_helper.c,v 1.5 2010/11/03 16:10:23 christos Exp $ */ +/* $NetBSD: k_helper.c,v 1.6 2012/06/03 10:59:44 dsl Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: k_helper.c,v 1.5 2010/11/03 16:10:23 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: k_helper.c,v 1.6 2012/06/03 10:59:44 dsl Exp $); #include sys/param.h #include sys/kernel.h @@ -88,7 +88,7 @@ SYSCTL_SETUP(sysctl_k_helper_setup, sys CTLFLAG_PERMANENT, CTLTYPE_STRING, prop_str_val, SYSCTL_DESCR(String property's value), - NULL, 0, prop_str_val, 0, + NULL, 0, prop_str_val, 0, CTL_VENDOR, K_HELPER, K_HELPER_PROP_STR_VAL, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL,
CVS commit: src/sys/kern
Module Name:src
Committed By: dsl
Date: Sun Jun 3 11:37:45 UTC 2012
Modified Files:
src/sys/kern: vfs_bio.c
Log Message:
Fix processing of vm.bufmem_lowater and vm.bufmem_hiwater on 64bit systems.
The values are 'u_long' so copying them into an 'int' temporary
(to avoid writing an out of range value into the actual variable)
doesn't work too well at all.
Shows up on amd64 now that the sysctl values are marked as 64bit.
sparc64 must have been badly broken for ages.
To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/kern/vfs_bio.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/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.237 src/sys/kern/vfs_bio.c:1.238
--- src/sys/kern/vfs_bio.c:1.237 Sat Jun 2 21:36:46 2012
+++ src/sys/kern/vfs_bio.c Sun Jun 3 11:37:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.237 2012/06/02 21:36:46 dsl Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.238 2012/06/03 11:37:44 dsl Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.237 2012/06/02 21:36:46 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.238 2012/06/03 11:37:44 dsl Exp $);
#include opt_bufcache.h
@@ -1730,39 +1730,41 @@ sysctl_dobuf(SYSCTLFN_ARGS)
static int
sysctl_bufvm_update(SYSCTLFN_ARGS)
{
- int t, error, rv;
+ int error, rv;
struct sysctlnode node;
+ union u_int_long { unsigned int i; unsigned long l; } t;
+ /* Take a copy of the supplied node and its data */
node = *rnode;
node.sysctl_data = t;
- t = *(int *)rnode-sysctl_data;
+ t = *(union u_int_long *)rnode-sysctl_data;
+
+ /* Update the copy */
error = sysctl_lookup(SYSCTLFN_CALL(node));
if (error || newp == NULL)
return (error);
- if (t 0)
- return EINVAL;
if (rnode-sysctl_data == bufcache) {
- if (t 100)
+ if (t.i 100)
return (EINVAL);
- bufcache = t;
+ bufcache = t.i;
buf_setwm();
} else if (rnode-sysctl_data == bufmem_lowater) {
- if (bufmem_hiwater - t 16)
+ if (bufmem_hiwater - t.l 16)
return (EINVAL);
- bufmem_lowater = t;
+ bufmem_lowater = t.l;
} else if (rnode-sysctl_data == bufmem_hiwater) {
- if (t - bufmem_lowater 16)
+ if (t.l - bufmem_lowater 16)
return (EINVAL);
- bufmem_hiwater = t;
+ bufmem_hiwater = t.l;
} else
return (EINVAL);
/* Drain until below new high water mark */
sysctl_unlock();
mutex_enter(bufcache_lock);
- while ((t = bufmem - bufmem_hiwater) = 0) {
- rv = buf_drain(t / (2 * 1024));
+ while (bufmem bufmem_hiwater) {
+ rv = buf_drain((bufmem - bufmem_hiwater) / (2 * 1024));
if (rv = 0)
break;
}
CVS commit: src/sys/dev/pckbport
Module Name:src Committed By: dsl Date: Sun Jun 3 13:52:46 UTC 2012 Modified Files: src/sys/dev/pckbport: synaptics.c Log Message: Remove a couple of (void *) casts added in the previous commin. They aren't needed here (script error). To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c diff -u src/sys/dev/pckbport/synaptics.c:1.29 src/sys/dev/pckbport/synaptics.c:1.30 --- src/sys/dev/pckbport/synaptics.c:1.29 Sat Jun 2 21:36:45 2012 +++ src/sys/dev/pckbport/synaptics.c Sun Jun 3 13:52:46 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: synaptics.c,v 1.29 2012/06/02 21:36:45 dsl Exp $ */ +/* $NetBSD: synaptics.c,v 1.30 2012/06/03 13:52:46 dsl Exp $ */ /* * Copyright (c) 2005, Steve C. Woodford @@ -48,7 +48,7 @@ #include opt_pms.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.29 2012/06/02 21:36:45 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.30 2012/06/03 13:52:46 dsl Exp $); #include sys/param.h #include sys/systm.h @@ -493,7 +493,7 @@ pms_sysctl_synaptics(struct sysctllog ** CTLTYPE_INT, scale_x, SYSCTL_DESCR(Horizontal movement scale factor), pms_sysctl_synaptics_verify, 0, - (void *)synaptics_scale_x, + synaptics_scale_x, 0, CTL_HW, root_num, CTL_CREATE, CTL_EOL)) != 0) goto err; @@ -505,7 +505,7 @@ pms_sysctl_synaptics(struct sysctllog ** CTLTYPE_INT, scale_y, SYSCTL_DESCR(Vertical movement scale factor), pms_sysctl_synaptics_verify, 0, - (void *)synaptics_scale_y, + synaptics_scale_y, 0, CTL_HW, root_num, CTL_CREATE, CTL_EOL)) != 0) goto err;
CVS commit: src/sys/kern
Module Name:src
Committed By: dsl
Date: Sun Jun 3 16:23:44 UTC 2012
Modified Files:
src/sys/kern: vfs_bio.c
Log Message:
Use separate temporaries for the 'int' percentage and the 'long'
water marks.
Previous paniced on sparc64 due to a misaligned copy.
To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/sys/kern/vfs_bio.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/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.238 src/sys/kern/vfs_bio.c:1.239
--- src/sys/kern/vfs_bio.c:1.238 Sun Jun 3 11:37:44 2012
+++ src/sys/kern/vfs_bio.c Sun Jun 3 16:23:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.238 2012/06/03 11:37:44 dsl Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.239 2012/06/03 16:23:44 dsl Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.238 2012/06/03 11:37:44 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.239 2012/06/03 16:23:44 dsl Exp $);
#include opt_bufcache.h
@@ -1732,12 +1732,18 @@ sysctl_bufvm_update(SYSCTLFN_ARGS)
{
int error, rv;
struct sysctlnode node;
- union u_int_long { unsigned int i; unsigned long l; } t;
+ unsigned int temp_bufcache;
+ unsigned long temp_water;
/* Take a copy of the supplied node and its data */
node = *rnode;
- node.sysctl_data = t;
- t = *(union u_int_long *)rnode-sysctl_data;
+ if (node.sysctl_data == bufcache) {
+ node.sysctl_data = temp_bufcache;
+ temp_bufcache = *(unsigned int *)rnode-sysctl_data;
+ } else {
+ node.sysctl_data = temp_water;
+ temp_water = *(unsigned long *)rnode-sysctl_data;
+ }
/* Update the copy */
error = sysctl_lookup(SYSCTLFN_CALL(node));
@@ -1745,18 +1751,18 @@ sysctl_bufvm_update(SYSCTLFN_ARGS)
return (error);
if (rnode-sysctl_data == bufcache) {
- if (t.i 100)
+ if (temp_bufcache 100)
return (EINVAL);
- bufcache = t.i;
+ bufcache = temp_bufcache;
buf_setwm();
} else if (rnode-sysctl_data == bufmem_lowater) {
- if (bufmem_hiwater - t.l 16)
+ if (bufmem_hiwater - temp_water 16)
return (EINVAL);
- bufmem_lowater = t.l;
+ bufmem_lowater = temp_water;
} else if (rnode-sysctl_data == bufmem_hiwater) {
- if (t.l - bufmem_lowater 16)
+ if (temp_water - bufmem_lowater 16)
return (EINVAL);
- bufmem_hiwater = t.l;
+ bufmem_hiwater = temp_water;
} else
return (EINVAL);
CVS commit: xsrc/external/mit/xf86-video-ati/dist
Module Name:xsrc Committed By: rjs Date: Sun Jun 3 16:33:33 UTC 2012 Update of /cvsroot/xsrc/external/mit/xf86-video-ati/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20142 Log Message: initial import of xf86-video-ati-6.14.4 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-6-14-4 U xsrc/external/mit/xf86-video-ati/dist/configure.ac U xsrc/external/mit/xf86-video-ati/dist/INSTALL U xsrc/external/mit/xf86-video-ati/dist/depcomp U xsrc/external/mit/xf86-video-ati/dist/configure U xsrc/external/mit/xf86-video-ati/dist/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/README U xsrc/external/mit/xf86-video-ati/dist/COPYING U xsrc/external/mit/xf86-video-ati/dist/install-sh U xsrc/external/mit/xf86-video-ati/dist/config.guess U xsrc/external/mit/xf86-video-ati/dist/compile U xsrc/external/mit/xf86-video-ati/dist/config.h.in U xsrc/external/mit/xf86-video-ati/dist/config.sub U xsrc/external/mit/xf86-video-ati/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati/dist/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/ChangeLog U xsrc/external/mit/xf86-video-ati/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati/dist/missing U xsrc/external/mit/xf86-video-ati/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati/dist/src/ativersion.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h U xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c C xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c U xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg_auto.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_macros.h N xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_version.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c U xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_mm_i2c.c U xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/cayman_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/ati.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c C xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.c U xsrc/external/mit/xf86-video-ati/dist/src/ati.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.h U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg_auto.h U xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_module.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pm.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect_module.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200_module.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r6xx.h U
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc
Committed By: rjs
Date: Sun Jun 3 16:42:23 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: r600_exa.c r6xx_accel.c
radeon_dri.c radeon_driver.c radeon_exa_funcs.c
radeon_textured_video.c
Log Message:
merge xf86-video-ati 6.14.4
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c:1.3 xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c:1.3 Sat Jul 23 08:27:24 2011
+++ xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c Sun Jun 3 16:42:22 2012
@@ -62,15 +62,11 @@ R600SetAccelState(ScrnInfoPtr pScrn,
memcpy(accel_state-src_obj[0], src0, sizeof(struct r600_accel_object));
accel_state-src_size[0] = src0-pitch * src0-height * (src0-bpp/8);
#if defined(XF86DRM_MODE)
- if (info-cs) {
- pitch_align = drmmode_get_pitch_align(pScrn,
- accel_state-src_obj[0].bpp / 8,
- accel_state-src_obj[0].tiling_flags) - 1;
- base_align = drmmode_get_base_align(pScrn,
- accel_state-src_obj[0].bpp / 8,
- accel_state-src_obj[0].tiling_flags) - 1;
+ if (info-cs src0-surface) {
+ accel_state-src_size[0] = src0-surface-bo_size;
}
#endif
+
/* bad pitch */
if (accel_state-src_obj[0].pitch pitch_align)
RADEON_FALLBACK((Bad src pitch 0x%08x\n, accel_state-src_obj[0].pitch));
@@ -88,15 +84,11 @@ R600SetAccelState(ScrnInfoPtr pScrn,
memcpy(accel_state-src_obj[1], src1, sizeof(struct r600_accel_object));
accel_state-src_size[1] = src1-pitch * src1-height * (src1-bpp/8);
#if defined(XF86DRM_MODE)
- if (info-cs) {
- pitch_align = drmmode_get_pitch_align(pScrn,
- accel_state-src_obj[1].bpp / 8,
- accel_state-src_obj[1].tiling_flags) - 1;
- base_align = drmmode_get_base_align(pScrn,
- accel_state-src_obj[1].bpp / 8,
- accel_state-src_obj[1].tiling_flags) - 1;
+ if (info-cs src1-surface) {
+ accel_state-src_size[1] = src1-surface-bo_size;
}
#endif
+
/* bad pitch */
if (accel_state-src_obj[1].pitch pitch_align)
RADEON_FALLBACK((Bad src pitch 0x%08x\n, accel_state-src_obj[1].pitch));
@@ -113,15 +105,13 @@ R600SetAccelState(ScrnInfoPtr pScrn,
memcpy(accel_state-dst_obj, dst, sizeof(struct r600_accel_object));
accel_state-dst_size = dst-pitch * dst-height * (dst-bpp/8);
#if defined(XF86DRM_MODE)
- if (info-cs) {
- pitch_align = drmmode_get_pitch_align(pScrn,
- accel_state-dst_obj.bpp / 8,
- accel_state-dst_obj.tiling_flags) - 1;
- base_align = drmmode_get_base_align(pScrn,
- accel_state-dst_obj.bpp / 8,
- accel_state-dst_obj.tiling_flags) - 1;
- }
+ if (info-cs dst-surface) {
+ accel_state-dst_size = dst-surface-bo_size;
+ } else
#endif
+ {
+ accel_state-dst_obj.tiling_flags = 0;
+ }
if (accel_state-dst_obj.pitch pitch_align)
RADEON_FALLBACK((Bad dst pitch 0x%08x\n, accel_state-dst_obj.pitch));
@@ -132,6 +122,11 @@ R600SetAccelState(ScrnInfoPtr pScrn,
accel_state-dst_size = 0;
}
+#ifdef XF86DRM_MODE
+if (info-cs CS_FULL(info-cs))
+ radeon_cs_flush_indirect(pScrn);
+#endif
+
accel_state-rop = rop;
accel_state-planemask = planemask;
@@ -170,9 +165,6 @@ R600SetAccelState(ScrnInfoPtr pScrn,
return TRUE;
}
-static void
-R600DoneSolid(PixmapPtr pPix);
-
static Bool
R600PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
{
@@ -195,6 +187,7 @@ R600PrepareSolid(PixmapPtr pPix, int alu
dst.offset = 0;
dst.bo = radeon_get_pixmap_bo(pPix);
dst.tiling_flags = radeon_get_pixmap_tiling(pPix);
+ dst.surface = radeon_get_pixmap_surface(pPix);
} else
#endif
{
@@ -252,6 +245,9 @@ R600PrepareSolid(PixmapPtr pPix, int alu
cb_conf.h = accel_state-dst_obj.height;
cb_conf.base = accel_state-dst_obj.offset;
cb_conf.bo = accel_state-dst_obj.bo;
+#ifdef XF86DRM_MODE
+cb_conf.surface = accel_state-dst_obj.surface;
+#endif
if (accel_state-dst_obj.bpp == 8) {
cb_conf.format = COLOR_8;
@@ -282,7 +278,7 @@ R600PrepareSolid(PixmapPtr pPix, int alu
cb_conf.pmask |= 8; /* A */
cb_conf.rop = accel_state-rop;
if (accel_state-dst_obj.tiling_flags == 0)
- cb_conf.array_mode = 1;
+ cb_conf.array_mode = 0;
r600_set_render_target(pScrn, accel_state-ib,
CVS commit: xsrc/external/mit/xf86-video-ati/include
Module Name:xsrc Committed By: rjs Date: Sun Jun 3 16:43:30 UTC 2012 Modified Files: xsrc/external/mit/xf86-video-ati/include: config.h Log Message: update for 6.14.4 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xf86-video-ati/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-ati/include/config.h diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.12 xsrc/external/mit/xf86-video-ati/include/config.h:1.13 --- xsrc/external/mit/xf86-video-ati/include/config.h:1.12 Sat Jul 23 09:32:27 2011 +++ xsrc/external/mit/xf86-video-ati/include/config.h Sun Jun 3 16:43:30 2012 @@ -83,7 +83,7 @@ #define PACKAGE_NAME xf86-video-ati /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-ati 6.14.2 +#define PACKAGE_STRING xf86-video-ati 6.14.4 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-ati @@ -92,7 +92,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 6.14.2 +#define PACKAGE_VERSION 6.14.4 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 6 @@ -101,7 +101,7 @@ #define PACKAGE_VERSION_MINOR 14 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 2 +#define PACKAGE_VERSION_PATCHLEVEL 4 /* Enable DRI2 code */ #define RADEON_DRI2 1 @@ -119,7 +119,7 @@ #define USE_XAA 1 /* Version number of package */ -#define VERSION 6.14.2 +#define VERSION 6.14.4 /* Enable DRI driver support */ #define XF86DRI 1
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: rmind
Date: Sun Jun 3 16:46:08 UTC 2012
Modified Files:
src/sys/rump/librump/rumpvfs: vm_vfs.c
Log Message:
rumpvfs:
- ubc_uiomove: avoid the re-lock dance, since the lock is shared these days.
- uvm_aio_aiodone: acquire the lock before modifying the page flags.
Tested by martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/rump/librump/rumpvfs/vm_vfs.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/rump/librump/rumpvfs/vm_vfs.c
diff -u src/sys/rump/librump/rumpvfs/vm_vfs.c:1.32 src/sys/rump/librump/rumpvfs/vm_vfs.c:1.33
--- src/sys/rump/librump/rumpvfs/vm_vfs.c:1.32 Sun Jun 19 18:28:24 2011
+++ src/sys/rump/librump/rumpvfs/vm_vfs.c Sun Jun 3 16:46:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_vfs.c,v 1.32 2011/06/19 18:28:24 hannken Exp $ */
+/* $NetBSD: vm_vfs.c,v 1.33 2012/06/03 16:46:08 rmind Exp $ */
/*
* Copyright (c) 2008-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_vfs.c,v 1.32 2011/06/19 18:28:24 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_vfs.c,v 1.33 2012/06/03 16:46:08 rmind Exp $);
#include sys/param.h
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, $NetBSD: vm_vfs.c,v 1
void
uvm_aio_aiodone(struct buf *bp)
{
- struct uvm_object *uobj;
+ struct uvm_object *uobj = NULL;
int i, npages = bp-b_bufsize PAGE_SHIFT;
struct vm_page **pgs;
vaddr_t va;
@@ -55,6 +55,15 @@ uvm_aio_aiodone(struct buf *bp)
for (i = 0; i npages; i++) {
va = (vaddr_t)bp-b_data + (i PAGE_SHIFT);
pgs[i] = uvm_pageratop(va);
+
+ if (uobj == NULL) {
+ uobj = pgs[i]-uobject;
+ KASSERT(uobj != NULL);
+ mutex_enter(uobj-vmobjlock);
+ } else {
+ KASSERT(uobj == pgs[i]-uobject);
+ }
+
if (pgs[i]-flags PG_PAGEOUT) {
KASSERT((pgs[i]-flags PG_FAKE) == 0);
pageout++;
@@ -62,19 +71,14 @@ uvm_aio_aiodone(struct buf *bp)
pgs[i]-flags |= PG_RELEASED;
}
}
+ KASSERT(mutex_owned(uobj-vmobjlock));
- uvm_pagermapout((vaddr_t)bp-b_data, npages);
-
- /* get uobj because we need it after pages might be recycled */
- uobj = pgs[0]-uobject;
- KASSERT(uobj);
-
- mutex_enter(uobj-vmobjlock);
mutex_enter(uvm_pageqlock);
uvm_page_unbusy(pgs, npages);
mutex_exit(uvm_pageqlock);
mutex_exit(uobj-vmobjlock);
+ uvm_pagermapout((vaddr_t)bp-b_data, npages);
uvm_pageout_done(pageout);
if (BUF_ISWRITE(bp) (bp-b_cflags BC_AGE) != 0) {
@@ -105,7 +109,6 @@ void
ubc_zerorange(struct uvm_object *uobj, off_t off, size_t len, int flags)
{
struct vm_page **pgs;
- struct uvm_object *pguobj;
int maxpages = MIN(32, round_page(len) PAGE_SHIFT);
int rv, npages, i;
@@ -122,7 +125,8 @@ ubc_zerorange(struct uvm_object *uobj, o
0, PAGERFLAGS | PGO_PASTEOF);
KASSERT(npages 0);
- for (i = 0, pguobj = NULL; i npages; i++) {
+ mutex_enter(uobj-vmobjlock);
+ for (i = 0; i npages; i++) {
struct vm_page *pg;
uint8_t *start;
size_t chunkoff, chunklen;
@@ -130,9 +134,9 @@ ubc_zerorange(struct uvm_object *uobj, o
pg = pgs[i];
if (pg == NULL)
break;
- if (pguobj == NULL)
-pguobj = pg-uobject;
- KASSERT(pguobj == pg-uobject);
+
+ KASSERT(pg-uobject != NULL);
+ KASSERT(uobj-vmobjlock == pg-uobject-vmobjlock);
chunkoff = off PAGE_MASK;
chunklen = MIN(PAGE_SIZE - chunkoff, len);
@@ -144,17 +148,10 @@ ubc_zerorange(struct uvm_object *uobj, o
off += chunklen;
len -= chunklen;
}
- mutex_enter(pguobj-vmobjlock);
uvm_page_unbusy(pgs, npages);
- if (pguobj != uobj) {
- mutex_exit(pguobj-vmobjlock);
- mutex_enter(uobj-vmobjlock);
- }
}
mutex_exit(uobj-vmobjlock);
kmem_free(pgs, maxpages * sizeof(pgs));
-
- return;
}
#define len2npages(off, len) \
@@ -165,7 +162,6 @@ ubc_uiomove(struct uvm_object *uobj, str
int advice, int flags)
{
struct vm_page **pgs;
- struct uvm_object *pguobj;
int npages = len2npages(uio-uio_offset, todo);
size_t pgalloc;
int i, rv, pagerflags;
@@ -193,7 +189,8 @@ ubc_uiomove(struct uvm_object *uobj, str
if (rv)
goto out;
- for (i = 0, pguobj = NULL; i npages; i++) {
+ mutex_enter(uobj-vmobjlock);
+ for (i = 0; i npages; i++) {
struct vm_page *pg;
size_t xfersize;
off_t pageoff;
@@ -201,31 +198,25 @@ ubc_uiomove(struct uvm_object *uobj, str
pg = pgs[i];
if (pg == NULL)
break;
- if (pguobj == NULL)
-pguobj = pg-uobject;
- KASSERT(pguobj == pg-uobject);
+ KASSERT(pg-uobject != NULL);
+ KASSERT(uobj-vmobjlock == pg-uobject-vmobjlock);
pageoff = uio-uio_offset PAGE_MASK;
+
xfersize = MIN(MIN(todo, PAGE_SIZE), PAGE_SIZE-pageoff);
KASSERT(xfersize 0);
rv = uiomove((uint8_t *)pg-uanon + pageoff,
xfersize, uio);
if (rv) {
-mutex_enter(pguobj-vmobjlock);
uvm_page_unbusy(pgs, npages);
-mutex_exit(pguobj-vmobjlock);
+mutex_exit(uobj-vmobjlock);
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sun Jun 3 17:01:22 UTC 2012 Modified Files: src/share/man/man9: usbdi.9 Log Message: Remove superfluous Pp. New sentence, new line. Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man9/usbdi.9 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/man9/usbdi.9 diff -u src/share/man/man9/usbdi.9:1.21 src/share/man/man9/usbdi.9:1.22 --- src/share/man/man9/usbdi.9:1.21 Sun Jun 3 02:56:36 2012 +++ src/share/man/man9/usbdi.9 Sun Jun 3 17:01:21 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: usbdi.9,v 1.21 2012/06/03 02:56:36 mrg Exp $ +.\ $NetBSD: usbdi.9,v 1.22 2012/06/03 17:01:21 wiz Exp $ .\ .\ Copyright (c) 2012 Matthew R. Green .\ All rights reserved. @@ -285,7 +285,7 @@ A transfer describes a communication wit A transfer is an abstract concept that can result in several physical packets being transferred to or from a device. A transfer is described by the -.Va usbd_xfer_handle +.Va usbd_xfer_handle cookie. A pipe is a logical connection to a USB device. It is described by the @@ -478,7 +478,6 @@ macro can be used to match any USB produ .\ .Fn usbd_set_config_index usbd_device_handle dev int index int msg .\ .Ft usbd_status .\ -.Pp .Sh PIPES Pipes are created and destroyed by using the .Fn usbd_open_pipe , @@ -514,7 +513,6 @@ may be set to .Dv USBD_DEFAULT_INTERVAL use the default interval, specified by the ep. description. It is common to have more than one pipe per device. -.Pp .Sh TRANSFERS Transfers are allocated and deallocated with .Fn usbd_alloc_xfer @@ -679,7 +677,8 @@ section, and then .Fa data is a buffer containing the data .\ (if any) -for the request. For the +for the request. +For the .Fn usbd_do_request_flags function there are additional .Fa flags @@ -882,9 +881,9 @@ member may be one of the following value There are two functions available to ease the detach of active devices. Typically a reference count is maintained on syscall activity. When a USB device is to be detached, the reference count should be -decremented and if it is greater or equal to zero, +decremented and if it is greater or equal to zero, .Fn usb_detach_wait -should be called on the +should be called on the .Ft dv associated with this USB device and, typically, a device-specific condition variable @@ -899,16 +898,16 @@ must be called on the .Ft dv and .Fa cv -that is being waited on with +that is being waited on with .Fn usb_detach_wait . .Pp These functions are only available with the USB SMP code. .Pp The are another pair of functions with similar functionality that do not use a condition variable or mutex and should be avoided in new code. -The +The .Fn usb_detach_waitold -function works like +function works like .Fn usb_detach_wait , and the .Fn usb_detach_wakeupold
CVS commit: src/sys/uvm
Module Name:src Committed By: rmind Date: Sun Jun 3 17:12:49 UTC 2012 Modified Files: src/sys/uvm: uvm_km.c Log Message: Improve the wording slightly. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/uvm/uvm_km.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/uvm/uvm_km.c diff -u src/sys/uvm/uvm_km.c:1.126 src/sys/uvm/uvm_km.c:1.127 --- src/sys/uvm/uvm_km.c:1.126 Sat Jun 2 08:42:37 2012 +++ src/sys/uvm/uvm_km.c Sun Jun 3 17:12:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_km.c,v 1.126 2012/06/02 08:42:37 para Exp $ */ +/* $NetBSD: uvm_km.c,v 1.127 2012/06/03 17:12:49 rmind Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -89,8 +89,8 @@ * exec_map = used during exec to handle exec args * etc... * - * the kmem_arena is a special submap, as it lives a fixed map entry - * within the kernel_map and controlled by vmem(9). + * The kmem_arena is a special submap, as it lives in a fixed map entry + * within the kernel_map and is controlled by vmem(9). * * the kernel allocates its private memory out of special uvm_objects whose * reference count is set to UVM_OBJ_KERN (thus indicating that the objects @@ -122,29 +122,37 @@ * this has to be done because there is no backing store for kernel pages * and no need to save them after they are no longer referenced. * - * kmem_arena: main arena controlling the kernel kva used by other arenas. - * kmem_va_arena: it utilizes quantum caching for fast allocations and to - * lower fragmentation. the pool and kmem allocate from this arena - * except for some pool meta-data. - * - * arenas for metadata allocations used by vmem(9) and pool(9) - * note: these arenas can't use quantum caching, the kmem_va_meta_arena - * compensates for this by importing larger chunks from kmem_arena. - * - * kmem_va_meta_arena: space for metadata is allocated from this arena. - * kmem_meta_arena: imports from kmem_va_meta_arena. - * allocations from this arena are backed with vm_pages. - * - * arena stacking: - * kmem_arena - * kmem_va_arena - * kmem_va_meta_arena - * kmem_meta_arena + * Generic arenas: * + * kmem_arena: + * Main arena controlling the kernel KVA used by other arenas. + * + * kmem_va_arena: + * Implements quantum caching in order to speedup allocations and + * reduce fragmentation. The pool(9), unless created with a custom + * meta-data allocator, and kmem(9) subsystems use this arena. + * + * Arenas for meta-data allocations are used by vmem(9) and pool(9). + * These arenas cannot use quantum cache. However, kmem_va_meta_arena + * compensates this by importing larger chunks from kmem_arena. + * + * kmem_va_meta_arena: + * Space for meta-data. + * + * kmem_meta_arena: + * Imports from kmem_va_meta_arena. Allocations from this arena are + * backed with the pages. + * + * Arena stacking: + * + * kmem_arena + * kmem_va_arena + * kmem_va_meta_arena + * kmem_meta_arena */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.126 2012/06/02 08:42:37 para Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.127 2012/06/03 17:12:49 rmind Exp $); #include opt_uvmhist.h
CVS commit: src/tools/compat
Module Name:src Committed By: joerg Date: Sun Jun 3 21:01:43 UTC 2012 Modified Files: src/tools/compat: compat_defs.h Log Message: Add __predict_true / __predict_false definitions. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/tools/compat/compat_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/tools/compat/compat_defs.h diff -u src/tools/compat/compat_defs.h:1.84 src/tools/compat/compat_defs.h:1.85 --- src/tools/compat/compat_defs.h:1.84 Sat Jun 2 22:54:52 2012 +++ src/tools/compat/compat_defs.h Sun Jun 3 21:01:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_defs.h,v 1.84 2012/06/02 22:54:52 joerg Exp $ */ +/* $NetBSD: compat_defs.h,v 1.85 2012/06/03 21:01:43 joerg Exp $ */ #ifndef __NETBSD_COMPAT_DEFS_H__ #define __NETBSD_COMPAT_DEFS_H__ @@ -72,6 +72,11 @@ #endif #define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) +#undef __predict_false +#define __predict_false(x) x +#undef __predict_true +#define __predict_true(x) x + /* We don't include pwd.h here, so that compat_pwd.h works. */ struct passwd;
CVS commit: src
Module Name:src
Committed By: joerg
Date: Sun Jun 3 21:02:50 UTC 2012
Modified Files:
src/lib/libc/cdb: cdbw.3 cdbw.c
src/tools/compat: Makefile
Added Files:
src/tools/compat: cdbw.h
Log Message:
Add a special seeder for cdbw_output that gives stable results.
Hook up cdbw(3) for the tool build.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/cdb/cdbw.3 src/lib/libc/cdb/cdbw.c
cvs rdiff -u -r1.56 -r1.57 src/tools/compat/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/compat/cdbw.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/cdb/cdbw.3
diff -u src/lib/libc/cdb/cdbw.3:1.3 src/lib/libc/cdb/cdbw.3:1.4
--- src/lib/libc/cdb/cdbw.3:1.3 Wed Nov 3 16:17:48 2010
+++ src/lib/libc/cdb/cdbw.3 Sun Jun 3 21:02:50 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: cdbw.3,v 1.3 2010/11/03 16:17:48 plunky Exp $
+.\ $NetBSD: cdbw.3,v 1.4 2012/06/03 21:02:50 joerg Exp $
.\
.\ Copyright (c) 2010 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -28,7 +28,7 @@
.\ 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.
-.Dd November 3, 2010
+.Dd June 3, 2012
.Dt CDBW 3
.Os
.Sh NAME
@@ -36,6 +36,8 @@
.Nm cdbw_put ,
.Nm cdbw_put_data ,
.Nm cdbw_put_key ,
+.Nm cdbw_stable_seeder ,
+.Nm cdbw_output ,
.Nm cdbw_close
.Nd create constant databases
.Sh SYNOPSIS
@@ -64,6 +66,10 @@
.Fa size_t keylen
.Fa uint32_t index
.Fc
+.Ft uint32_t
+.Fo cdbw_stable_seeder
+.Fa void
+.Fc
.Ft int
.Fo cdbw_output
.Fa struct cdbw *cdbw
@@ -111,8 +117,12 @@ parameter provides a human readable desc
The
.Fn seedgen
parameter can be used to override the default PRNG.
-The function should return a different value for each invokation.
The bitwise layout of the output depends on the chosen seed.
+The function should return a different value for each invokation.
+The
+.Fn cdbw_stable_seeder
+can be used to create reproducable output.
+It may be slower than the default.
.Sh SEE ALSO
.Xr cdbr 3 ,
.Xr cdb 5
Index: src/lib/libc/cdb/cdbw.c
diff -u src/lib/libc/cdb/cdbw.c:1.3 src/lib/libc/cdb/cdbw.c:1.4
--- src/lib/libc/cdb/cdbw.c:1.3 Tue Mar 13 21:32:12 2012
+++ src/lib/libc/cdb/cdbw.c Sun Jun 3 21:02:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cdbw.c,v 1.3 2012/03/13 21:32:12 joerg Exp $ */
+/* $NetBSD: cdbw.c,v 1.4 2012/06/03 21:02:50 joerg Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,11 +36,13 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: cdbw.c,v 1.3 2012/03/13 21:32:12 joerg Exp $);
+__RCSID($NetBSD: cdbw.c,v 1.4 2012/06/03 21:02:50 joerg Exp $);
#include namespace.h
+#if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
#include sys/endian.h
+#endif
#include sys/queue.h
#include cdbw.h
#include stdlib.h
@@ -270,6 +272,12 @@ cdbw_close(struct cdbw *cdbw)
free(cdbw);
}
+uint32_t
+cdbw_stable_seeder(void)
+{
+ return 0;
+}
+
#define unused 0xU
struct vertex {
@@ -556,8 +564,13 @@ cdbw_output(struct cdbw *cdbw, int fd, c
return 0;
}
+#if HAVE_NBTOOL_CONFIG_H
+ if (seedgen == NULL)
+ seedgen = cdbw_stable_seeder;
+#else
if (seedgen == NULL)
seedgen = arc4random;
+#endif
rv = 0;
@@ -581,8 +594,12 @@ cdbw_output(struct cdbw *cdbw, int fd, c
goto release;
}
+ state.seed = 0;
do {
- state.seed = (*seedgen)();
+ if (seedgen == cdbw_stable_seeder)
+ ++state.seed;
+ else
+ state.seed = (*seedgen)();
} while (build_graph(cdbw, state));
assign_nodes(state);
Index: src/tools/compat/Makefile
diff -u src/tools/compat/Makefile:1.56 src/tools/compat/Makefile:1.57
--- src/tools/compat/Makefile:1.56 Sat Feb 18 17:51:21 2012
+++ src/tools/compat/Makefile Sun Jun 3 21:02:50 2012
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.56 2012/02/18 17:51:21 njoly Exp $
+# $NetBSD: Makefile,v 1.57 2012/06/03 21:02:50 joerg Exp $
HOSTLIB= nbcompat
-SRCS= atoll.c basename.c dirname.c fgetln.c flock.c fparseln.c \
- fpurge.c getline.c getmode.c getopt_long.c gettemp.c \
+SRCS= atoll.c basename.c cdbw.c dirname.c \
+ fgetln.c flock.c fparseln.c fpurge.c \
+ getline.c getmode.c getopt_long.c gettemp.c \
heapsort.c \
issetugid.c lchflags.c lchmod.c lchown.c libyywrap.c \
md2.c md2hl.c md4c.c md4hl.c md5c.c md5hl.c \
@@ -31,7 +32,8 @@ CPPFLAGS+= -no-cpp-precomp
CPPFLAGS+= -I. -I./include -I${.CURDIR} -I${.CURDIR}/sys \
-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
-.PATH: ${.CURDIR}/../../lib/libc/gen \
+.PATH: ${.CURDIR}/../../lib/libc/cdb \
+ ${.CURDIR}/../../lib/libc/gen \
${.CURDIR}/../../lib/libc/hash \
${.CURDIR}/../../lib/libc/hash/md2 \
${.CURDIR}/../../lib/libc/hash/md5 \
Added files:
Index: src/tools/compat/cdbw.h
diff -u /dev/null src/tools/compat/cdbw.h:1.1
--- /dev/null Sun Jun 3 21:02:50 2012
+++ src/tools/compat/cdbw.h Sun Jun 3 21:02:50 2012
@@ -0,0
CVS commit: src/include
Module Name:src Committed By: joerg Date: Sun Jun 3 21:21:45 UTC 2012 Modified Files: src/include: cdbw.h Log Message: Prototype for cdbw_stable_seeder. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/include/cdbw.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/cdbw.h diff -u src/include/cdbw.h:1.1 src/include/cdbw.h:1.2 --- src/include/cdbw.h:1.1 Sun Apr 25 00:54:45 2010 +++ src/include/cdbw.h Sun Jun 3 21:21:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cdbw.h,v 1.1 2010/04/25 00:54:45 joerg Exp $ */ +/* $NetBSD: cdbw.h,v 1.2 2012/06/03 21:21:45 joerg Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -49,6 +49,7 @@ int cdbw_put_data(struct cdbw *, const uint32_t *); int cdbw_put_key(struct cdbw *, const void *, size_t, uint32_t); +uint32_t cdbw_stable_seeder(void); int cdbw_output(struct cdbw *, int, const char[16], uint32_t (*)(void)); void cdbw_close(struct cdbw *);
CVS commit: src/lib/libc/include
Module Name:src
Committed By: joerg
Date: Sun Jun 3 21:27:30 UTC 2012
Modified Files:
src/lib/libc/include: reentrant.h
Log Message:
Provide a usable thr_once for !_REENTRANT
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/include/reentrant.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/include/reentrant.h
diff -u src/lib/libc/include/reentrant.h:1.14 src/lib/libc/include/reentrant.h:1.15
--- src/lib/libc/include/reentrant.h:1.14 Sun Jan 11 02:46:28 2009
+++ src/lib/libc/include/reentrant.h Sun Jun 3 21:27:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: reentrant.h,v 1.14 2009/01/11 02:46:28 christos Exp $ */
+/* $NetBSD: reentrant.h,v 1.15 2012/06/03 21:27:30 joerg Exp $ */
/*-
* Copyright (c) 1997, 1998, 2003 The NetBSD Foundation, Inc.
@@ -84,8 +84,6 @@
*
*/
-#ifdef _REENTRANT
-
/*
* Abstract thread interface for thread-safe libraries. These routines
* will use stubs in libc if the application is not linked against the
@@ -124,6 +122,8 @@
#define once_t pthread_once_t
#define ONCE_INITIALIZER PTHREAD_ONCE_INIT
+#ifdef _REENTRANT
+
#ifndef __LIBC_THREAD_STUBS
__BEGIN_DECLS
@@ -254,7 +254,15 @@ __END_DECLS
#define thr_getspecific(k)
#define thr_keydelete(k)
-#define thr_once(o, f)
+static inline int
+thr_once(once_t *once_control, void (*routine)(void))
+{
+ if (__predict_false(once_control-pto_done == 0)) {
+ (*routine)();
+ once_control-pto_done = 1;
+ }
+ return 0;
+}
#define thr_sigsetmask(f, n, o)
#define thr_self()
#define thr_errno()
CVS commit: [netbsd-6] src
Module Name:src
Committed By: jdc
Date: Sun Jun 3 21:41:35 UTC 2012
Modified Files:
src/include [netbsd-6]: netdb.h
src/lib/libc/net [netbsd-6]: getaddrinfo.c
Log Message:
Pull up revisions:
src/lib/libc/net/getaddrinfo.c revision 1.98 - 1.100
src/include/netdb.h revision 1.65
(requested by khorben in ticket #278).
Add AI_ADDRCONFIG, which makes getaddrinfo() return only address with
families
that are already configured in the system.
PR 46206: fix programmed SIGSEGV
more work is needed as tests seem to indicate that name resolution now
does no seem to work (firefox reports Server not found)
thanks to Ryo ONODERA for testing.
PR pkg/46206
re-establish fqdn lookup when AI_ADDRCONFIG is used in hints
AI_ADDRCONFIG led to fqdn lookup being skipped as the systems didn't
configure any PF_UNSPEC addresses - check was too strict here.
Thnaks to Ryo ONODERA for testing.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.8.1 src/include/netdb.h
cvs rdiff -u -r1.96 -r1.96.4.1 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/netdb.h
diff -u src/include/netdb.h:1.64 src/include/netdb.h:1.64.8.1
--- src/include/netdb.h:1.64 Wed May 5 17:12:29 2010
+++ src/include/netdb.h Sun Jun 3 21:41:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netdb.h,v 1.64 2010/05/05 17:12:29 christos Exp $ */
+/* $NetBSD: netdb.h,v 1.64.8.1 2012/06/03 21:41:34 jdc Exp $ */
/*
* ++Copyright++ 1980, 1983, 1988, 1993
@@ -269,7 +269,9 @@ struct addrinfo {
#define AI_NUMERICSERV 0x0008 /* prevent service name resolution */
/* valid flags for addrinfo (not a standard def, apps should not use it) */
#define AI_MASK \
-(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV)
+(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \
+AI_ADDRCONFIG)
+#define AI_ADDRCONFIG 0x0400 /* only if any address is assigned */
#endif
#if (_POSIX_C_SOURCE - 0) = 200112L || (_XOPEN_SOURCE - 0) = 520 || \
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.96 src/lib/libc/net/getaddrinfo.c:1.96.4.1
--- src/lib/libc/net/getaddrinfo.c:1.96 Sat Oct 15 23:00:02 2011
+++ src/lib/libc/net/getaddrinfo.c Sun Jun 3 21:41:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.96 2011/10/15 23:00:02 christos Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.96.4.1 2012/06/03 21:41:34 jdc Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: getaddrinfo.c,v 1.96 2011/10/15 23:00:02 christos Exp $);
+__RCSID($NetBSD: getaddrinfo.c,v 1.96.4.1 2012/06/03 21:41:34 jdc Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -76,6 +76,7 @@ __RCSID($NetBSD: getaddrinfo.c,v 1.96 2
#include stdlib.h
#include string.h
#include unistd.h
+#include ifaddrs.h
#include syslog.h
#include stdarg.h
@@ -208,6 +209,7 @@ static int get_portmatch(const struct ad
static int get_port(const struct addrinfo *, const char *, int,
struct servent_data *);
static const struct afd *find_afd(int);
+static int addrconfig(uint64_t *);
#ifdef INET6
static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *);
#endif
@@ -348,6 +350,7 @@ getaddrinfo(const char *hostname, const
struct addrinfo *pai;
const struct explore *ex;
struct servent_data svd;
+ uint64_t mask = (uint64_t)~0ULL;
/* hostname is allowed to be NULL */
/* servname is allowed to be NULL */
@@ -409,6 +412,9 @@ getaddrinfo(const char *hostname, const
}
}
+ if ((pai-ai_flags AI_ADDRCONFIG) != 0 addrconfig(mask) == -1)
+ ERR(EAI_FAIL);
+
/*
* check for special cases. (1) numeric servname is disallowed if
* socktype/protocol are left unspecified. (2) servname is disallowed
@@ -441,6 +447,10 @@ getaddrinfo(const char *hostname, const
for (ex = explore; ex-e_af = 0; ex++) {
*pai = ai0;
+ /* ADDRCONFIG check */
+ if uint64_t)1 ex-e_af) mask) == 0)
+ continue;
+
/* PF_UNSPEC entries are prepared for DNS queries only */
if (ex-e_af == PF_UNSPEC)
continue;
@@ -451,7 +461,6 @@ getaddrinfo(const char *hostname, const
continue;
if (!MATCH(pai-ai_protocol, ex-e_protocol, WILD_PROTOCOL(ex)))
continue;
-
if (pai-ai_family == PF_UNSPEC)
pai-ai_family = ex-e_af;
if (pai-ai_socktype == ANY ex-e_socktype != ANY)
@@ -494,6 +503,13 @@ getaddrinfo(const char *hostname, const
for (ex = explore; ex-e_af = 0; ex++) {
*pai = ai0;
+
+ /* ADDRCONFIG check */
+ /* PF_UNSPEC entries are prepared for DNS queries only */
+ if (ex-e_af != PF_UNSPEC
+ (((uint64_t)1 ex-e_af) mask) == 0)
+ continue;
+
/* require exact match for family field */
if (pai-ai_family != ex-e_af)
continue;
@@ -1006,6 +1022,30 @@ find_afd(int af)
return NULL;
}
+/*
+ * AI_ADDRCONFIG
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: jdc
Date: Sun Jun 3 21:42:52 UTC 2012
Modified Files:
src/sys/arch/i386/stand/lib [netbsd-6]: exec.c
src/sys/arch/sandpoint/stand/altboot [netbsd-6]: main.c
src/sys/lib/libsa [netbsd-6]: ext2fs.c ffsv1.c ffsv2.c globals.c
lfsv1.c lfsv2.c stand.h ufs.c
Log Message:
Pull up revisions:
src/sys/arch/i386/stand/lib/exec.c revision 1.50
src/sys/arch/sandpoint/stand/altboot/main.c revision 1.21 via patch
src/sys/lib/libsa/ext2fs.c revision 1.13
src/sys/lib/libsa/ffsv1.c revision 1.6
src/sys/lib/libsa/ffsv2.c revision 1.6
src/sys/lib/libsa/globals.c revision 1.9
src/sys/lib/libsa/lfsv1.c revision 1.5
src/sys/lib/libsa/lfsv2.c revision 1.5
src/sys/lib/libsa/stand.h revision 1.76
src/sys/lib/libsa/ufs.c revision 1.58
(requested by dsl in ticket #279).
Remove the code that tries to load the ffs kernel module during boot.
This is in line with the core decision than even modular kernels should
contain the ffs code.
I've left in the code that tries to load nfs and ext2fs, but it
isn't clear that is necessary.
Removes a warning message that (usually) flashes past to fast to read.
AFAICT all the relevant kernels contain ffs (and nfs for that matter).
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/arch/i386/stand/lib/exec.c
cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/arch/sandpoint/stand/altboot/main.c
cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/lib/libsa/ext2fs.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/lib/libsa/ffsv1.c \
src/sys/lib/libsa/ffsv2.c
cvs rdiff -u -r1.8 -r1.8.22.1 src/sys/lib/libsa/globals.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/lib/libsa/lfsv1.c \
src/sys/lib/libsa/lfsv2.c
cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/lib/libsa/stand.h
cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/lib/libsa/ufs.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/i386/stand/lib/exec.c
diff -u src/sys/arch/i386/stand/lib/exec.c:1.49 src/sys/arch/i386/stand/lib/exec.c:1.49.4.1
--- src/sys/arch/i386/stand/lib/exec.c:1.49 Mon Nov 28 07:56:54 2011
+++ src/sys/arch/i386/stand/lib/exec.c Sun Jun 3 21:42:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.49 2011/11/28 07:56:54 tls Exp $ */
+/* $NetBSD: exec.c,v 1.49.4.1 2012/06/03 21:42:51 jdc Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -297,10 +297,9 @@ common_load_kernel(const char *file, u_l
close(fd);
- /* Now we know the root fs type, load modules for it. */
- module_add(fsmod);
- if (fsmod2 != NULL strcmp(fsmod, fsmod2) != 0)
- module_add(fsmod2);
+ /* If the root fs type is unusual, load its module. */
+ if (fsmod != NULL)
+ module_add(fsmod);
/*
* Gather some information for the kernel. Do this after the
Index: src/sys/arch/sandpoint/stand/altboot/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.17 src/sys/arch/sandpoint/stand/altboot/main.c:1.17.2.1
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.17 Sun Jan 22 13:08:16 2012
+++ src/sys/arch/sandpoint/stand/altboot/main.c Sun Jun 3 21:42:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.17 2012/01/22 13:08:16 phx Exp $ */
+/* $NetBSD: main.c,v 1.17.2.1 2012/06/03 21:42:51 jdc Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -328,9 +328,8 @@ main(int argc, char *argv[], char *boota
}
if (modules_enabled) {
- module_add(fsmod);
- if (fsmod2 != NULL strcmp(fsmod, fsmod2) != 0)
- module_add(fsmod2);
+ if (fsmod != NULL)
+ module_add(fsmod);
kmodloadp = marks[MARK_END];
btinfo_modulelist = NULL;
module_load(bname);
Index: src/sys/lib/libsa/ext2fs.c
diff -u src/sys/lib/libsa/ext2fs.c:1.12 src/sys/lib/libsa/ext2fs.c:1.12.2.1
--- src/sys/lib/libsa/ext2fs.c:1.12 Mon Jan 16 18:44:13 2012
+++ src/sys/lib/libsa/ext2fs.c Sun Jun 3 21:42:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.c,v 1.12 2012/01/16 18:44:13 christos Exp $ */
+/* $NetBSD: ext2fs.c,v 1.12.2.1 2012/06/03 21:42:52 jdc Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@@ -713,10 +713,8 @@ ext2fs_open(const char *path, struct ope
out:
if (rc)
ext2fs_close(f);
- else {
+ else
fsmod = ext2fs;
- fsmod2 = ffs;
- }
return rc;
}
Index: src/sys/lib/libsa/ffsv1.c
diff -u src/sys/lib/libsa/ffsv1.c:1.5 src/sys/lib/libsa/ffsv1.c:1.5.2.1
--- src/sys/lib/libsa/ffsv1.c:1.5 Sun Dec 25 06:09:08 2011
+++ src/sys/lib/libsa/ffsv1.c Sun Jun 3 21:42:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ffsv1.c,v 1.5 2011/12/25 06:09:08 tsutsui Exp $ */
+/* $NetBSD: ffsv1.c,v 1.5.2.1 2012/06/03 21:42:52 jdc Exp $ */
#define LIBSA_FFSv1
@@ -15,6 +15,4 @@
#define ufs_dinode ufs1_dinode
#define indp_t int32_t
-#define FSMOD ffs
-
#include ufs.c
Index: src/sys/lib/libsa/ffsv2.c
diff -u src/sys/lib/libsa/ffsv2.c:1.5 src/sys/lib/libsa/ffsv2.c:1.5.2.1
--- src/sys/lib/libsa/ffsv2.c:1.5 Sun Dec 25 06:09:08 2011
+++ src/sys/lib/libsa/ffsv2.c Sun Jun 3 21:42:52 2012
@@
CVS commit: src
Module Name:src Committed By: joerg Date: Sun Jun 3 21:42:47 UTC 2012 Modified Files: src/bin/ps: ps.1 src/distrib/amd64/cdroms: install.sh src/distrib/amd64/installimage: install.sh src/distrib/i386/cdroms: install.sh src/distrib/i386/installimage: install.sh src/distrib/sparc64/cdroms/installcd: install.sh src/distrib/sparc64/instfs: dot.profile src/etc/rc.d: sysdb src/include: paths.h stdlib.h src/lib/libc/gen: devname.3 devname.c ttyname.3 ttyname.c src/lib/libc/include: namespace.h src/share/man/man5: rc.conf.5 src/tests/include: t_paths.c src/usr.sbin/dev_mkdb: Makefile dev_mkdb.8 dev_mkdb.c Log Message: Switch device database to cdb(5). Rework ttyname(3) and ttyname_r(3) to depend on new devname_r(3) as heart. Add /dev/pts magic directly to devname(3). While it can lead to returning non-existing paths, the behavior is more consistent that way. Drop caching layer in devname(3), it doesn't buy anything for the common case of having access to the database. Teach devname(3) proper fallback behavior of scanning /dev. Create both old-style and new-style database for now in /etc/rc.d/sysdb. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/bin/ps/ps.1 cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/install.sh cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/cdroms/install.sh cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/installimage/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/sparc64/cdroms/installcd/install.sh cvs rdiff -u -r1.6 -r1.7 src/distrib/sparc64/instfs/dot.profile cvs rdiff -u -r1.23 -r1.24 src/etc/rc.d/sysdb cvs rdiff -u -r1.40 -r1.41 src/include/paths.h cvs rdiff -u -r1.98 -r1.99 src/include/stdlib.h cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/devname.3 cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/devname.c cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/ttyname.3 cvs rdiff -u -r1.24 -r1.25 src/lib/libc/gen/ttyname.c cvs rdiff -u -r1.153 -r1.154 src/lib/libc/include/namespace.h cvs rdiff -u -r1.151 -r1.152 src/share/man/man5/rc.conf.5 cvs rdiff -u -r1.11 -r1.12 src/tests/include/t_paths.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/dev_mkdb/Makefile cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/dev_mkdb/dev_mkdb.8 cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/dev_mkdb/dev_mkdb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/ps/ps.1 diff -u src/bin/ps/ps.1:1.100 src/bin/ps/ps.1:1.101 --- src/bin/ps/ps.1:1.100 Sun Apr 15 21:20:16 2012 +++ src/bin/ps/ps.1 Sun Jun 3 21:42:44 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: ps.1,v 1.100 2012/04/15 21:20:16 wiz Exp $ +.\ $NetBSD: ps.1,v 1.101 2012/06/03 21:42:44 joerg Exp $ .\ .\ Copyright (c) 1980, 1990, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -682,7 +682,7 @@ exit or stop status (valid only for stop special files and device names .It Pa /dev/drum default swap device -.It Pa /var/run/dev.db +.It Pa /var/run/dev.cdb /dev name database .It Pa /var/db/kvm.db system name list database Index: src/distrib/amd64/cdroms/install.sh diff -u src/distrib/amd64/cdroms/install.sh:1.2 src/distrib/amd64/cdroms/install.sh:1.3 --- src/distrib/amd64/cdroms/install.sh:1.2 Sun Apr 17 12:18:20 2011 +++ src/distrib/amd64/cdroms/install.sh Sun Jun 3 21:42:44 2012 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.2 2011/04/17 12:18:20 martin Exp $ +# $NetBSD: install.sh,v 1.3 2012/06/03 21:42:44 joerg Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ termfile=/tmp/sysinst.term # Check if we are on a framebuffer or on serial console and default # the terminal type accordingly. -# There is no /var/db/dev.db, so sysctl might not map the devicename properly; +# There is no /var/db/dev.cdb, so sysctl might not map the devicename properly; # ttyE0 is 90,0 - 0x5a00 case $(sysctl -nx kern.consdev) in 002f) Index: src/distrib/amd64/installimage/install.sh diff -u src/distrib/amd64/installimage/install.sh:1.1 src/distrib/amd64/installimage/install.sh:1.2 --- src/distrib/amd64/installimage/install.sh:1.1 Sun Jan 22 03:53:29 2012 +++ src/distrib/amd64/installimage/install.sh Sun Jun 3 21:42:45 2012 @@ -1,5 +1,5 @@ #! /bin/sh -m -# $NetBSD: install.sh,v 1.1 2012/01/22 03:53:29 tsutsui Exp $ +# $NetBSD: install.sh,v 1.2 2012/06/03 21:42:45 joerg Exp $ # # - # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ termfile=/tmp/sysinst.term # Check if we are on a framebuffer or on serial console and default # the terminal type accordingly. -# There is no /var/db/dev.db, so sysctl might not map the devicename properly; +# There is no /var/db/dev.cdb, so sysctl might not map the devicename properly; # ttyE0 is 90,0 - 0x5a00 case $(sysctl -nx kern.consdev) in 002f)
CVS commit: [netbsd-6] src/sys/arch/amd64
Module Name:src
Committed By: jdc
Date: Sun Jun 3 21:45:10 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-6]: trap.c vector.S
src/sys/arch/amd64/include [netbsd-6]: frameasm.h
Log Message:
Pull up revisions:
src/sys/arch/amd64/include/frameasm.h revision 1.17-1.19
src/sys/arch/amd64/amd64/vector.S revision 1.40-1.41
src/sys/arch/amd64/amd64/trap.c revision 1.71
(requested by dsl in ticket #280).
Move all the XEN differences to a single conditional.
Merge the XEN/non-XEN versions of INTRFASTEXIT and
INTR_RECURSE_HWFRAME by using extra defines.
Split INTRENTRY so that code can insert extra instructions
inside user/kernel conditional.
Add a ';' that got deleted in a slight tidyup.
Rejig the way TRAP() and ZTRAP() are defined and add Z/TRAP_NJ() that
excludes the 'jmp alltraps'.
Use the _NJ versions for trap entries with non-standard code.
Move all the KDTRACE_HOOKS code into a single block inside the
IDTVEC(trap03) code. This removes a mis-predicted from every
trap when KDTRACE_HOOKS are enabled.
Add a few blank lines, need some comments as well :-)
No functional changes intended.
Let the user of INTRENTRY_L() place a label on the 'swapgs' used
when faulting from user space.
If we get a fault setting the user %gs, or on a iret that is returning
to userspace, we must do a 'swapgs' to reload the kernel %gs_base.
Also save the %ds, %es, %fs, %gs selector values in the frame so
they can be restored if we finally return to user (probably after
an application SIGSEGV handler has fixed the error).
Without this any such fault leaves the kernel running with the wrong
%gs offset and it will most likely fault again early in trap().
Repeats until the stack tramples on something important.
iret change works, invalid %gs is a little harder to arrange.
Treat traps in kernel mode during the 'return to user' iret sequence
as user faults.
Based heavily in the i386 code with the correct opcode bytes inserted.
iret path tested, arranging for segment register errors is harder.
User %fs and %gs (32bit apps) are loaded much earlier and any errors
will generate kernel panics - there is probably code to try to stop
the invalid values being set.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.38.8.1 -r1.38.8.2 src/sys/arch/amd64/amd64/vector.S
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/amd64/include/frameasm.h
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/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.69 src/sys/arch/amd64/amd64/trap.c:1.69.2.1
--- src/sys/arch/amd64/amd64/trap.c:1.69 Sat Feb 4 22:45:40 2012
+++ src/sys/arch/amd64/amd64/trap.c Sun Jun 3 21:45:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.69 2012/02/04 22:45:40 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.69.2.1 2012/06/03 21:45:10 jdc Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.69 2012/02/04 22:45:40 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.69.2.1 2012/06/03 21:45:10 jdc Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -122,6 +122,7 @@ dtrace_doubletrap_func_t dtrace_doubletr
#endif
void trap(struct trapframe *);
+void trap_return_fault_return(struct trapframe *) __dead;
const char * const trap_type[] = {
privileged instruction fault, /* 0 T_PRIVINFLT */
@@ -200,17 +201,14 @@ trap(struct trapframe *frame)
struct lwp *l = curlwp;
struct proc *p;
struct pcb *pcb;
- extern char fusuintrfailure[], kcopy_fault[],
- resume_iret[];
+ extern char fusuintrfailure[], kcopy_fault[];
extern char IDTVEC(oosyscall)[];
extern char IDTVEC(osyscall)[];
extern char IDTVEC(syscall32)[];
-#if 0
- extern char resume_pop_ds[], resume_pop_es[];
-#endif
+#ifndef XEN
struct trapframe *vframe;
+#endif
ksiginfo_t ksi;
- void *resume;
void *onfault;
int type, error;
uint64_t cr2;
@@ -312,50 +310,76 @@ copyfault:
/*
* Check for failure during return to user mode.
+ * This can happen loading invalid values into the segment
+ * registers, or during the 'iret' itself.
*
- * XXXfvdl check for rex prefix?
- *
- * We do this by looking at the instruction we faulted on. The
- * specific instructions we recognize only happen when
+ * We do this by looking at the instruction we faulted on.
+ * The specific instructions we recognize only happen when
* returning from a trap, syscall, or interrupt.
- *
- * XXX
- * The heuristic used here will currently fail for the case of
- * one of the 2 pop instructions faulting when returning from a
- * a fast interrupt. This should not be possible. It can be
- * fixed by rearranging the trap frame so that the stack format
- * at this point is the same as on exit from a `slow'
- * interrupt.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 21:45:49 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 278 - 280. To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.110 src/doc/CHANGES-6.0:1.1.2.111 --- src/doc/CHANGES-6.0:1.1.2.110 Wed May 30 08:06:48 2012 +++ src/doc/CHANGES-6.0 Sun Jun 3 21:45:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.110 2012/05/30 08:06:48 sborrill Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.111 2012/06/03 21:45:49 jdc Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -2570,3 +2570,37 @@ sys/dev/iscsi/iscsi_main.c 1.2-1.3 documentation somewhat for the in-kernel iSCSI initiator. [riz, ticket #291] +lib/libc/net/getaddrinfo.c 1.98 - 1.100 +include/netdb.h 1.65 + Add AI_ADDRCONFIG, which makes getaddrinfo() return only address with + families that are already configured in the system. + [khorben, ticket #278] + +sys/arch/i386/stand/lib/exec.c 1.50 +sys/arch/sandpoint/stand/altboot/main.c 1.21 via patch +sys/lib/libsa/ext2fs.c1.13 +sys/lib/libsa/ffsv1.c1.6 +sys/lib/libsa/ffsv2.c1.6 +sys/lib/libsa/globals.c1.9 +sys/lib/libsa/lfsv1.c1.5 +sys/lib/libsa/lfsv2.c1.5 +sys/lib/libsa/stand.h1.76 +sys/lib/libsa/ufs.c1.58 + Remove the code that tries to load the ffs kernel module during boot. + This is in line with the core decision than even modular kernels should + contain the ffs code. + I've left in the code that tries to load nfs and ext2fs, but it + isn't clear that is necessary. + Removes a warning message that (usually) flashes past to fast to read. + AFAICT all the relevant kernels contain ffs (and nfs for that matter). + [dsl, ticket #279] + +sys/arch/amd64/include/frameasm.h 1.17-1.19 +sys/arch/amd64/amd64/vector.S 1.40-1.41 +sys/arch/amd64/amd64/trap.c 1.71 + Fix issues when amd64 manages to trap during 'return to user'. ie on + the 'iret' or while loading segment registers. + Also detects any fault loading %gs and re-instates the kernel gs_base + value before entering the trap handler. + [dsl, ticket #280] +
CVS commit: src
Module Name:src Committed By: joerg Date: Sun Jun 3 23:19:11 UTC 2012 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/i386/cdroms: Makefile.cdrom src/distrib/sets/lists/base: mi src/distrib/sets/lists/tests: mi src/distrib/sparc64/cdroms/installcd: Makefile src/distrib/sparc64/instfs: list src/lib/libterminfo: Makefile.hash compile.c term.c term_private.h terminfo.5.in src/share/man/man7: hier.7 src/share/terminfo: Makefile src/tests/lib/libcurses: Makefile src/tests/lib/libcurses/director: director.c src/usr.bin/tic: tic.1 tic.c Log Message: Switch terminfo(3) to cdb(5). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.26 -r1.27 src/distrib/i386/cdroms/Makefile.cdrom cvs rdiff -u -r1.995 -r1.996 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.471 -r1.472 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.14 -r1.15 src/distrib/sparc64/cdroms/installcd/Makefile cvs rdiff -u -r1.24 -r1.25 src/distrib/sparc64/instfs/list cvs rdiff -u -r1.4 -r1.5 src/lib/libterminfo/Makefile.hash cvs rdiff -u -r1.7 -r1.8 src/lib/libterminfo/compile.c cvs rdiff -u -r1.14 -r1.15 src/lib/libterminfo/term.c cvs rdiff -u -r1.9 -r1.10 src/lib/libterminfo/term_private.h cvs rdiff -u -r1.15 -r1.16 src/lib/libterminfo/terminfo.5.in cvs rdiff -u -r1.100 -r1.101 src/share/man/man7/hier.7 cvs rdiff -u -r1.2 -r1.3 src/share/terminfo/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/Makefile cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libcurses/director/director.c cvs rdiff -u -r1.9 -r1.10 src/usr.bin/tic/tic.1 cvs rdiff -u -r1.19 -r1.20 src/usr.bin/tic/tic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/cdroms/Makefile.cdrom diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.6 src/distrib/amd64/cdroms/Makefile.cdrom:1.7 --- src/distrib/amd64/cdroms/Makefile.cdrom:1.6 Tue Jun 21 21:49:22 2011 +++ src/distrib/amd64/cdroms/Makefile.cdrom Sun Jun 3 23:19:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.6 2011/06/21 21:49:22 joerg Exp $ +# $NetBSD: Makefile.cdrom,v 1.7 2012/06/03 23:19:09 joerg Exp $ .include bsd.own.mk @@ -53,7 +53,7 @@ CDRUNTIME+= ./usr/mdec CDRUNTIME+= ./usr/sbin/chroot CDRUNTIME+= ./usr/sbin/installboot CDRUNTIME+= ./usr/sbin/wiconfig -CDRUNTIME+= ./usr/share/misc/terminfo.db +CDRUNTIME+= ./usr/share/misc/terminfo.cdb CDRUNTIME+= ./usr/share/locale image_md_pre: Index: src/distrib/i386/cdroms/Makefile.cdrom diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.26 src/distrib/i386/cdroms/Makefile.cdrom:1.27 --- src/distrib/i386/cdroms/Makefile.cdrom:1.26 Tue Jun 21 21:49:23 2011 +++ src/distrib/i386/cdroms/Makefile.cdrom Sun Jun 3 23:19:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.26 2011/06/21 21:49:23 joerg Exp $ +# $NetBSD: Makefile.cdrom,v 1.27 2012/06/03 23:19:09 joerg Exp $ .include bsd.own.mk @@ -53,7 +53,7 @@ CDRUNTIME+= ./usr/mdec CDRUNTIME+= ./usr/sbin/chroot CDRUNTIME+= ./usr/sbin/installboot CDRUNTIME+= ./usr/sbin/wiconfig -CDRUNTIME+= ./usr/share/misc/terminfo.db +CDRUNTIME+= ./usr/share/misc/terminfo.cdb CDRUNTIME+= ./usr/share/locale image_md_pre: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.995 src/distrib/sets/lists/base/mi:1.996 --- src/distrib/sets/lists/base/mi:1.995 Fri Jun 1 13:19:38 2012 +++ src/distrib/sets/lists/base/mi Sun Jun 3 23:19:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.995 2012/06/01 13:19:38 nonaka Exp $ +# $NetBSD: mi,v 1.996 2012/06/03 23:19:09 joerg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -3773,7 +3773,8 @@ ./usr/share/misc/more.help base-obsolete obsolete ./usr/share/misc/nslookup.help base-obsolete obsolete ./usr/share/misc/terminfo base-terminfo-share share -./usr/share/misc/terminfo.db base-terminfo-share share +./usr/share/misc/terminfo.cdb base-terminfo-share share +./usr/share/misc/terminfo.db base-obsolete obsolete ./usr/share/misc/units.lib base-reference-share share ./usr/share/misc/usb_hid_usages base-reference-share share ./usr/share/misc/vgrindefs.db base-groff-share share Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.471 src/distrib/sets/lists/tests/mi:1.472 --- src/distrib/sets/lists/tests/mi:1.471 Fri Jun 1 10:52:38 2012 +++ src/distrib/sets/lists/tests/mi Sun Jun 3 23:19:10 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.471 2012/06/01 10:52:38 skrll Exp $ +# $NetBSD: mi,v 1.472 2012/06/03 23:19:10 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2510,7 +2510,8 @@ ./usr/tests/lib/libcrypt/t_crypt tests-lib-tests ./usr/tests/lib/libcurses tests-lib-tests
CVS commit: src/lib/libc/cdb
Module Name:src Committed By: wiz Date: Mon Jun 4 00:26:29 UTC 2012 Modified Files: src/lib/libc/cdb: cdbw.3 Log Message: Fix typos. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/cdb/cdbw.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/cdb/cdbw.3 diff -u src/lib/libc/cdb/cdbw.3:1.4 src/lib/libc/cdb/cdbw.3:1.5 --- src/lib/libc/cdb/cdbw.3:1.4 Sun Jun 3 21:02:50 2012 +++ src/lib/libc/cdb/cdbw.3 Mon Jun 4 00:26:29 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cdbw.3,v 1.4 2012/06/03 21:02:50 joerg Exp $ +.\ $NetBSD: cdbw.3,v 1.5 2012/06/04 00:26:29 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -118,10 +118,10 @@ The .Fn seedgen parameter can be used to override the default PRNG. The bitwise layout of the output depends on the chosen seed. -The function should return a different value for each invokation. +The function should return a different value for each invocation. The .Fn cdbw_stable_seeder -can be used to create reproducable output. +can be used to create reproducible output. It may be slower than the default. .Sh SEE ALSO .Xr cdbr 3 ,
CVS commit: src/usr.sbin/npf/npftest
Module Name:src
Committed By: rmind
Date: Mon Jun 4 00:28:34 UTC 2012
Modified Files:
src/usr.sbin/npf/npftest: npftest.c npftest.h
src/usr.sbin/npf/npftest/libnpftest: Makefile npf_test.h
Added Files:
src/usr.sbin/npf/npftest/libnpftest: npf_state_test.c
Log Message:
npftest: add a module for TCP state tracking and add few test cases.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/npftest/npftest.c \
src/usr.sbin/npf/npftest/npftest.h
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/npftest/libnpftest/Makefile \
src/usr.sbin/npf/npftest/libnpftest/npf_test.h
cvs rdiff -u -r0 -r1.1 src/usr.sbin/npf/npftest/libnpftest/npf_state_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npftest/npftest.c
diff -u src/usr.sbin/npf/npftest/npftest.c:1.2 src/usr.sbin/npf/npftest/npftest.c:1.3
--- src/usr.sbin/npf/npftest/npftest.c:1.2 Wed May 30 21:38:04 2012
+++ src/usr.sbin/npf/npftest/npftest.c Mon Jun 4 00:28:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npftest.c,v 1.2 2012/05/30 21:38:04 rmind Exp $ */
+/* $NetBSD: npftest.c,v 1.3 2012/06/04 00:28:34 rmind Exp $ */
/*
* NPF testing framework.
@@ -179,6 +179,9 @@ main(int argc, char **argv)
ok = rumpns_npf_table_test(verbose);
result(table, ok);
+
+ ok = rumpns_npf_state_test(verbose);
+ result(state, ok);
}
if (stream) {
Index: src/usr.sbin/npf/npftest/npftest.h
diff -u src/usr.sbin/npf/npftest/npftest.h:1.2 src/usr.sbin/npf/npftest/npftest.h:1.3
--- src/usr.sbin/npf/npftest/npftest.h:1.2 Wed May 30 21:38:04 2012
+++ src/usr.sbin/npf/npftest/npftest.h Mon Jun 4 00:28:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npftest.h,v 1.2 2012/05/30 21:38:04 rmind Exp $ */
+/* $NetBSD: npftest.h,v 1.3 2012/06/04 00:28:34 rmind Exp $ */
/*
* Public Domain.
@@ -17,6 +17,7 @@ int rumpns_npf_test_handlepkt(const voi
bool rumpns_npf_nbuf_test(bool);
bool rumpns_npf_processor_test(bool);
bool rumpns_npf_table_test(bool);
+bool rumpns_npf_state_test(bool);
int process_stream(const char *, const char *, unsigned);
Index: src/usr.sbin/npf/npftest/libnpftest/Makefile
diff -u src/usr.sbin/npf/npftest/libnpftest/Makefile:1.2 src/usr.sbin/npf/npftest/libnpftest/Makefile:1.3
--- src/usr.sbin/npf/npftest/libnpftest/Makefile:1.2 Wed May 30 21:38:04 2012
+++ src/usr.sbin/npf/npftest/libnpftest/Makefile Mon Jun 4 00:28:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/05/30 21:38:04 rmind Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/04 00:28:34 rmind Exp $
#
# Public Domain
#
@@ -14,6 +14,7 @@ SRCS+= npf_mbuf_subr.c
SRCS+= npf_nbuf_test.c
SRCS+= npf_processor_test.c
SRCS+= npf_table_test.c
+SRCS+= npf_state_test.c
CPPFLAGS+= -D_NPF_TESTING
CPPFLAGS+= -I${.CURDIR}/../../../../sys/net/npf
Index: src/usr.sbin/npf/npftest/libnpftest/npf_test.h
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.2 src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.3
--- src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.2 Wed May 30 21:38:04 2012
+++ src/usr.sbin/npf/npftest/libnpftest/npf_test.h Mon Jun 4 00:28:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_test.h,v 1.2 2012/05/30 21:38:04 rmind Exp $ */
+/* $NetBSD: npf_test.h,v 1.3 2012/06/04 00:28:34 rmind Exp $ */
/*
* Public Domain.
@@ -37,5 +37,6 @@ void mbuf_icmp_append(struct mbuf *, st
bool npf_nbuf_test(bool);
bool npf_processor_test(bool);
bool npf_table_test(bool);
+bool npf_state_test(bool);
#endif
Added files:
Index: src/usr.sbin/npf/npftest/libnpftest/npf_state_test.c
diff -u /dev/null src/usr.sbin/npf/npftest/libnpftest/npf_state_test.c:1.1
--- /dev/null Mon Jun 4 00:28:34 2012
+++ src/usr.sbin/npf/npftest/libnpftest/npf_state_test.c Mon Jun 4 00:28:34 2012
@@ -0,0 +1,165 @@
+/* $NetBSD: npf_state_test.c,v 1.1 2012/06/04 00:28:34 rmind Exp $ */
+
+/*
+ * NPF state tracking test.
+ *
+ * Public Domain.
+ */
+
+#include sys/types.h
+#include sys/kmem.h
+
+#include npf_impl.h
+#include npf_test.h
+
+typedef struct {
+ int tcpfl; /* TCP flags. */
+ int tlen; /* TCP data length. */
+ uint32_t seq; /* SEQ number. */
+ uint32_t ack; /* ACK number. */
+ uint32_t win; /* TCP Window. */
+ int flags; /* Direction et al. */
+} tcp_meta_t;
+
+#define S TH_SYN
+#define A TH_ACK
+#define F TH_FIN
+#define OUT 0x1
+#define IN 0x2
+#define ERR 0x4
+#define CLEAR .flags = 0
+
+static const tcp_meta_t packet_sequence[] = {
+ /*
+ * TCP data SEQ ACK WIN
+ */
+
+ /* Out of order ACK. */
+ { S, 0, , 0, 4096, OUT },
+ { S|A, 0, 9, 1, 2048, IN },
+ { A, 0, 1, 10, 4096, OUT },
+ /* --- */
+ { A, 0, 10, 1, 2048, IN },
+ { A, 1000, 1, 10, 4096, OUT },
+ { A, 1000, 11000, 10, 4096, OUT },
+ { A, 0, 10, 12000, 2048, IN },
+ { A, 0, 10, 13000, 2048, IN },
+ { A, 1000, 12000, 10, 4096, OUT },
+ { A, 0, 10, 11000, 1048, IN },
+ /* --- */
+ { A, 1000, 14000, 10, 4096, OUT },
+ { A, 0,
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:16:33 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Add entry for #1762. To generate a diff of this commit: cvs rdiff -u -r1.1.2.168 -r1.1.2.169 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src
Module Name:src Committed By: jdc Date: Sun Jun 3 08:45:51 UTC 2012 Modified Files: src/distrib/sets/lists/base [netbsd-5]: rescue.mi src/rescue [netbsd-5]: list Log Message: Pull up revisions: src/distrib/sets/lists/base/rescue.mi revision 1.34 src/rescue/list revision 1.43 (requested by jnemeth in ticket #1764). PR/46393 - Nat Sloss -- add gpt(8) to /rescue To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.12.1 src/distrib/sets/lists/base/rescue.mi cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/rescue/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/arch/x68k/x68k
Module Name:src Committed By: jdc Date: Sun Jun 3 08:46:36 UTC 2012 Modified Files: src/sys/arch/x68k/x68k [netbsd-5]: clock.c Log Message: Pull up revision 1.34 (requested by isaki in ticket #1765). With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) in Timer-D. It fixes the clock ticked faster when timecounter uses mfp (as default choice). It was introduced in rev 1.24 in 2006. Thanks tsutsui@ for many comments. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.6.1 src/sys/arch/x68k/x68k/clock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-0] src/sys/arch/x68k/x68k
Module Name:src Committed By: jdc Date: Sun Jun 3 08:46:40 UTC 2012 Modified Files: src/sys/arch/x68k/x68k [netbsd-5-0]: clock.c Log Message: Pull up revision 1.34 (requested by isaki in ticket #1765). With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) in Timer-D. It fixes the clock ticked faster when timecounter uses mfp (as default choice). It was introduced in rev 1.24 in 2006. Thanks tsutsui@ for many comments. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/arch/x68k/x68k/clock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/sys/arch/x68k/x68k
Module Name:src Committed By: jdc Date: Sun Jun 3 08:46:43 UTC 2012 Modified Files: src/sys/arch/x68k/x68k [netbsd-5-1]: clock.c Log Message: Pull up revision 1.34 (requested by isaki in ticket #1765). With the freerunnnig mode, set 0 (=256count) not 0xff (=255count) in Timer-D. It fixes the clock ticked faster when timecounter uses mfp (as default choice). It was introduced in rev 1.24 in 2006. Thanks tsutsui@ for many comments. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.14.1 src/sys/arch/x68k/x68k/clock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src Committed By: jdc Date: Sun Jun 3 08:47:30 UTC 2012 Modified Files: src/sys/kern [netbsd-5-0]: uipc_usrreq.c Log Message: Pull up revision 1.137 (requested by martin in ticket #1766). Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors via SCM_RIGHT anxiliary socket messages. To generate a diff of this commit: cvs rdiff -u -r1.119.4.2 -r1.119.4.2.2.1 src/sys/kern/uipc_usrreq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/sys/kern
Module Name:src Committed By: jdc Date: Sun Jun 3 08:47:36 UTC 2012 Modified Files: src/sys/kern [netbsd-5-1]: uipc_usrreq.c Log Message: Pull up revision 1.137 (requested by martin in ticket #1766). Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors via SCM_RIGHT anxiliary socket messages. To generate a diff of this commit: cvs rdiff -u -r1.119.4.3 -r1.119.4.3.2.1 src/sys/kern/uipc_usrreq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:48:21 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1764, 1765, 1766. To generate a diff of this commit: cvs rdiff -u -r1.1.2.169 -r1.1.2.170 src/doc/CHANGES-5.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:48:22 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Tickets 1765 and 1766. To generate a diff of this commit: cvs rdiff -u -r1.1.2.74 -r1.1.2.75 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 08:48:25 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Tickets 1765 and 1766. To generate a diff of this commit: cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [jmcneill-usbmp] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Jun 3 09:34:04 UTC 2012 Modified Files: src/sys/dev/usb [jmcneill-usbmp]: TODO.usbmp Log Message: Note a working driver. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/sys/dev/usb/TODO.usbmp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: dsl Date: Sun Jun 3 10:45:11 UTC 2012 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: Fix build now that sysctl_createv() checks its arg type. To generate a diff of this commit: cvs rdiff -u -r1.240 -r1.241 src/sys/rump/librump/rumpkern/rump.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/lib/libzfs/common
Module Name:src Committed By: dsl Date: Sun Jun 3 10:53:52 UTC 2012 Modified Files: src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_sendrecv.c Log Message: Not sure why this has just started to fail! But it really isn't a good idea to compare a uint64_t to NULL. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/modules/k_helper
Module Name:src Committed By: dsl Date: Sun Jun 3 10:59:44 UTC 2012 Modified Files: src/tests/modules/k_helper: k_helper.c Log Message: Fix build - delete extra To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/modules/k_helper/k_helper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: dsl Date: Sun Jun 3 11:37:45 UTC 2012 Modified Files: src/sys/kern: vfs_bio.c Log Message: Fix processing of vm.bufmem_lowater and vm.bufmem_hiwater on 64bit systems. The values are 'u_long' so copying them into an 'int' temporary (to avoid writing an out of range value into the actual variable) doesn't work too well at all. Shows up on amd64 now that the sysctl values are marked as 64bit. sparc64 must have been badly broken for ages. To generate a diff of this commit: cvs rdiff -u -r1.237 -r1.238 src/sys/kern/vfs_bio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pckbport
Module Name:src Committed By: dsl Date: Sun Jun 3 13:52:46 UTC 2012 Modified Files: src/sys/dev/pckbport: synaptics.c Log Message: Remove a couple of (void *) casts added in the previous commin. They aren't needed here (script error). To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pckbport/synaptics.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: dsl Date: Sun Jun 3 16:23:44 UTC 2012 Modified Files: src/sys/kern: vfs_bio.c Log Message: Use separate temporaries for the 'int' percentage and the 'long' water marks. Previous paniced on sparc64 due to a misaligned copy. To generate a diff of this commit: cvs rdiff -u -r1.238 -r1.239 src/sys/kern/vfs_bio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati/dist
Module Name:xsrc Committed By: rjs Date: Sun Jun 3 16:33:33 UTC 2012 Update of /cvsroot/xsrc/external/mit/xf86-video-ati/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20142 Log Message: initial import of xf86-video-ati-6.14.4 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-6-14-4 U xsrc/external/mit/xf86-video-ati/dist/configure.ac U xsrc/external/mit/xf86-video-ati/dist/INSTALL U xsrc/external/mit/xf86-video-ati/dist/depcomp U xsrc/external/mit/xf86-video-ati/dist/configure U xsrc/external/mit/xf86-video-ati/dist/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/README U xsrc/external/mit/xf86-video-ati/dist/COPYING U xsrc/external/mit/xf86-video-ati/dist/install-sh U xsrc/external/mit/xf86-video-ati/dist/config.guess U xsrc/external/mit/xf86-video-ati/dist/compile U xsrc/external/mit/xf86-video-ati/dist/config.h.in U xsrc/external/mit/xf86-video-ati/dist/config.sub U xsrc/external/mit/xf86-video-ati/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati/dist/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/ChangeLog U xsrc/external/mit/xf86-video-ati/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati/dist/missing U xsrc/external/mit/xf86-video-ati/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati/dist/src/ativersion.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h U xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c C xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c U xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg_auto.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_macros.h N xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_version.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c U xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_mm_i2c.c U xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/cayman_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/ati.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c C xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.c U xsrc/external/mit/xf86-video-ati/dist/src/ati.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.h U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg_auto.h U xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_module.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pm.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect_module.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200_module.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r6xx.h U
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc Committed By: rjs Date: Sun Jun 3 16:42:23 UTC 2012 Modified Files: xsrc/external/mit/xf86-video-ati/dist/src: r600_exa.c r6xx_accel.c radeon_dri.c radeon_driver.c radeon_exa_funcs.c radeon_textured_video.c Log Message: merge xf86-video-ati 6.14.4 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati/include
Module Name:xsrc Committed By: rjs Date: Sun Jun 3 16:43:30 UTC 2012 Modified Files: xsrc/external/mit/xf86-video-ati/include: config.h Log Message: update for 6.14.4 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xf86-video-ati/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sun Jun 3 17:01:22 UTC 2012 Modified Files: src/share/man/man9: usbdi.9 Log Message: Remove superfluous Pp. New sentence, new line. Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man9/usbdi.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src Committed By: rmind Date: Sun Jun 3 17:12:49 UTC 2012 Modified Files: src/sys/uvm: uvm_km.c Log Message: Improve the wording slightly. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/uvm/uvm_km.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/compat
Module Name:src Committed By: joerg Date: Sun Jun 3 21:01:43 UTC 2012 Modified Files: src/tools/compat: compat_defs.h Log Message: Add __predict_true / __predict_false definitions. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/tools/compat/compat_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Sun Jun 3 21:02:50 UTC 2012 Modified Files: src/lib/libc/cdb: cdbw.3 cdbw.c src/tools/compat: Makefile Added Files: src/tools/compat: cdbw.h Log Message: Add a special seeder for cdbw_output that gives stable results. Hook up cdbw(3) for the tool build. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/cdb/cdbw.3 src/lib/libc/cdb/cdbw.c cvs rdiff -u -r1.56 -r1.57 src/tools/compat/Makefile cvs rdiff -u -r0 -r1.1 src/tools/compat/cdbw.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: joerg Date: Sun Jun 3 21:21:45 UTC 2012 Modified Files: src/include: cdbw.h Log Message: Prototype for cdbw_stable_seeder. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/include/cdbw.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/include
Module Name:src Committed By: joerg Date: Sun Jun 3 21:27:30 UTC 2012 Modified Files: src/lib/libc/include: reentrant.h Log Message: Provide a usable thr_once for !_REENTRANT To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/include/reentrant.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: jdc Date: Sun Jun 3 21:41:35 UTC 2012 Modified Files: src/include [netbsd-6]: netdb.h src/lib/libc/net [netbsd-6]: getaddrinfo.c Log Message: Pull up revisions: src/lib/libc/net/getaddrinfo.c revision 1.98 - 1.100 src/include/netdb.h revision 1.65 (requested by khorben in ticket #278). Add AI_ADDRCONFIG, which makes getaddrinfo() return only address with families that are already configured in the system. PR 46206: fix programmed SIGSEGV more work is needed as tests seem to indicate that name resolution now does no seem to work (firefox reports Server not found) thanks to Ryo ONODERA for testing. PR pkg/46206 re-establish fqdn lookup when AI_ADDRCONFIG is used in hints AI_ADDRCONFIG led to fqdn lookup being skipped as the systems didn't configure any PF_UNSPEC addresses - check was too strict here. Thnaks to Ryo ONODERA for testing. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.64.8.1 src/include/netdb.h cvs rdiff -u -r1.96 -r1.96.4.1 src/lib/libc/net/getaddrinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Sun Jun 3 21:42:47 UTC 2012 Modified Files: src/bin/ps: ps.1 src/distrib/amd64/cdroms: install.sh src/distrib/amd64/installimage: install.sh src/distrib/i386/cdroms: install.sh src/distrib/i386/installimage: install.sh src/distrib/sparc64/cdroms/installcd: install.sh src/distrib/sparc64/instfs: dot.profile src/etc/rc.d: sysdb src/include: paths.h stdlib.h src/lib/libc/gen: devname.3 devname.c ttyname.3 ttyname.c src/lib/libc/include: namespace.h src/share/man/man5: rc.conf.5 src/tests/include: t_paths.c src/usr.sbin/dev_mkdb: Makefile dev_mkdb.8 dev_mkdb.c Log Message: Switch device database to cdb(5). Rework ttyname(3) and ttyname_r(3) to depend on new devname_r(3) as heart. Add /dev/pts magic directly to devname(3). While it can lead to returning non-existing paths, the behavior is more consistent that way. Drop caching layer in devname(3), it doesn't buy anything for the common case of having access to the database. Teach devname(3) proper fallback behavior of scanning /dev. Create both old-style and new-style database for now in /etc/rc.d/sysdb. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/bin/ps/ps.1 cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/install.sh cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/cdroms/install.sh cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/installimage/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/sparc64/cdroms/installcd/install.sh cvs rdiff -u -r1.6 -r1.7 src/distrib/sparc64/instfs/dot.profile cvs rdiff -u -r1.23 -r1.24 src/etc/rc.d/sysdb cvs rdiff -u -r1.40 -r1.41 src/include/paths.h cvs rdiff -u -r1.98 -r1.99 src/include/stdlib.h cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/devname.3 cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/devname.c cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/ttyname.3 cvs rdiff -u -r1.24 -r1.25 src/lib/libc/gen/ttyname.c cvs rdiff -u -r1.153 -r1.154 src/lib/libc/include/namespace.h cvs rdiff -u -r1.151 -r1.152 src/share/man/man5/rc.conf.5 cvs rdiff -u -r1.11 -r1.12 src/tests/include/t_paths.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/dev_mkdb/Makefile cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/dev_mkdb/dev_mkdb.8 cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/dev_mkdb/dev_mkdb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys
Module Name:src Committed By: jdc Date: Sun Jun 3 21:42:52 UTC 2012 Modified Files: src/sys/arch/i386/stand/lib [netbsd-6]: exec.c src/sys/arch/sandpoint/stand/altboot [netbsd-6]: main.c src/sys/lib/libsa [netbsd-6]: ext2fs.c ffsv1.c ffsv2.c globals.c lfsv1.c lfsv2.c stand.h ufs.c Log Message: Pull up revisions: src/sys/arch/i386/stand/lib/exec.c revision 1.50 src/sys/arch/sandpoint/stand/altboot/main.c revision 1.21 via patch src/sys/lib/libsa/ext2fs.c revision 1.13 src/sys/lib/libsa/ffsv1.c revision 1.6 src/sys/lib/libsa/ffsv2.c revision 1.6 src/sys/lib/libsa/globals.c revision 1.9 src/sys/lib/libsa/lfsv1.c revision 1.5 src/sys/lib/libsa/lfsv2.c revision 1.5 src/sys/lib/libsa/stand.h revision 1.76 src/sys/lib/libsa/ufs.c revision 1.58 (requested by dsl in ticket #279). Remove the code that tries to load the ffs kernel module during boot. This is in line with the core decision than even modular kernels should contain the ffs code. I've left in the code that tries to load nfs and ext2fs, but it isn't clear that is necessary. Removes a warning message that (usually) flashes past to fast to read. AFAICT all the relevant kernels contain ffs (and nfs for that matter). To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/arch/i386/stand/lib/exec.c cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/arch/sandpoint/stand/altboot/main.c cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/lib/libsa/ext2fs.c cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/lib/libsa/ffsv1.c \ src/sys/lib/libsa/ffsv2.c cvs rdiff -u -r1.8 -r1.8.22.1 src/sys/lib/libsa/globals.c cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/lib/libsa/lfsv1.c \ src/sys/lib/libsa/lfsv2.c cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/lib/libsa/stand.h cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/lib/libsa/ufs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/amd64
Module Name:src Committed By: jdc Date: Sun Jun 3 21:45:10 UTC 2012 Modified Files: src/sys/arch/amd64/amd64 [netbsd-6]: trap.c vector.S src/sys/arch/amd64/include [netbsd-6]: frameasm.h Log Message: Pull up revisions: src/sys/arch/amd64/include/frameasm.h revision 1.17-1.19 src/sys/arch/amd64/amd64/vector.S revision 1.40-1.41 src/sys/arch/amd64/amd64/trap.c revision 1.71 (requested by dsl in ticket #280). Move all the XEN differences to a single conditional. Merge the XEN/non-XEN versions of INTRFASTEXIT and INTR_RECURSE_HWFRAME by using extra defines. Split INTRENTRY so that code can insert extra instructions inside user/kernel conditional. Add a ';' that got deleted in a slight tidyup. Rejig the way TRAP() and ZTRAP() are defined and add Z/TRAP_NJ() that excludes the 'jmp alltraps'. Use the _NJ versions for trap entries with non-standard code. Move all the KDTRACE_HOOKS code into a single block inside the IDTVEC(trap03) code. This removes a mis-predicted from every trap when KDTRACE_HOOKS are enabled. Add a few blank lines, need some comments as well :-) No functional changes intended. Let the user of INTRENTRY_L() place a label on the 'swapgs' used when faulting from user space. If we get a fault setting the user %gs, or on a iret that is returning to userspace, we must do a 'swapgs' to reload the kernel %gs_base. Also save the %ds, %es, %fs, %gs selector values in the frame so they can be restored if we finally return to user (probably after an application SIGSEGV handler has fixed the error). Without this any such fault leaves the kernel running with the wrong %gs offset and it will most likely fault again early in trap(). Repeats until the stack tramples on something important. iret change works, invalid %gs is a little harder to arrange. Treat traps in kernel mode during the 'return to user' iret sequence as user faults. Based heavily in the i386 code with the correct opcode bytes inserted. iret path tested, arranging for segment register errors is harder. User %fs and %gs (32bit apps) are loaded much earlier and any errors will generate kernel panics - there is probably code to try to stop the invalid values being set. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/arch/amd64/amd64/trap.c cvs rdiff -u -r1.38.8.1 -r1.38.8.2 src/sys/arch/amd64/amd64/vector.S cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/amd64/include/frameasm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Sun Jun 3 21:45:49 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 278 - 280. To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Sun Jun 3 23:19:11 UTC 2012 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/i386/cdroms: Makefile.cdrom src/distrib/sets/lists/base: mi src/distrib/sets/lists/tests: mi src/distrib/sparc64/cdroms/installcd: Makefile src/distrib/sparc64/instfs: list src/lib/libterminfo: Makefile.hash compile.c term.c term_private.h terminfo.5.in src/share/man/man7: hier.7 src/share/terminfo: Makefile src/tests/lib/libcurses: Makefile src/tests/lib/libcurses/director: director.c src/usr.bin/tic: tic.1 tic.c Log Message: Switch terminfo(3) to cdb(5). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.26 -r1.27 src/distrib/i386/cdroms/Makefile.cdrom cvs rdiff -u -r1.995 -r1.996 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.471 -r1.472 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.14 -r1.15 src/distrib/sparc64/cdroms/installcd/Makefile cvs rdiff -u -r1.24 -r1.25 src/distrib/sparc64/instfs/list cvs rdiff -u -r1.4 -r1.5 src/lib/libterminfo/Makefile.hash cvs rdiff -u -r1.7 -r1.8 src/lib/libterminfo/compile.c cvs rdiff -u -r1.14 -r1.15 src/lib/libterminfo/term.c cvs rdiff -u -r1.9 -r1.10 src/lib/libterminfo/term_private.h cvs rdiff -u -r1.15 -r1.16 src/lib/libterminfo/terminfo.5.in cvs rdiff -u -r1.100 -r1.101 src/share/man/man7/hier.7 cvs rdiff -u -r1.2 -r1.3 src/share/terminfo/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/Makefile cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libcurses/director/director.c cvs rdiff -u -r1.9 -r1.10 src/usr.bin/tic/tic.1 cvs rdiff -u -r1.19 -r1.20 src/usr.bin/tic/tic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/cdb
Module Name:src Committed By: wiz Date: Mon Jun 4 00:26:29 UTC 2012 Modified Files: src/lib/libc/cdb: cdbw.3 Log Message: Fix typos. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/cdb/cdbw.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npftest
Module Name:src Committed By: rmind Date: Mon Jun 4 00:28:34 UTC 2012 Modified Files: src/usr.sbin/npf/npftest: npftest.c npftest.h src/usr.sbin/npf/npftest/libnpftest: Makefile npf_test.h Added Files: src/usr.sbin/npf/npftest/libnpftest: npf_state_test.c Log Message: npftest: add a module for TCP state tracking and add few test cases. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/npftest/npftest.c \ src/usr.sbin/npf/npftest/npftest.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/npftest/libnpftest/Makefile \ src/usr.sbin/npf/npftest/libnpftest/npf_test.h cvs rdiff -u -r0 -r1.1 src/usr.sbin/npf/npftest/libnpftest/npf_state_test.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
