CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Mon Oct 19 07:24:44 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Pull up the following revisions(s) (requested by nakayama in ticket #1103): sys/arch/sparc64/include/userret.h: revision 1.9 sys/arch/sparc64/sparc64/trap.c:revision 1.158 Merge want_ast check in userret() into trap handler, and repeat preempt() call while want_resched is true. While there remove unnecessary #if 1. This should fix a performance degradation of disk I/O on heavy load. To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 src/doc/CHANGES-5.1 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 diff -u src/doc/CHANGES-5.1:1.1.2.122 src/doc/CHANGES-5.1:1.1.2.123 --- src/doc/CHANGES-5.1:1.1.2.122 Sun Oct 18 19:04:41 2009 +++ src/doc/CHANGES-5.1 Mon Oct 19 07:24:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.122 2009/10/18 19:04:41 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.123 2009/10/19 07:24:44 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14464,3 +14464,12 @@ Add hdaudio directory to the base set list. [sborrill, ticket #1102] +sys/arch/sparc64/include/userret.h 1.9 +sys/arch/sparc64/sparc64/trap.c 1.158 + + Merge want_ast check in userret() into trap handler, and + repeat preempt() call while want_resched is true. While + there remove unnecessary #if 1. This should fix a performance + degradation of disk I/O on heavy load. + [nakayama, ticket #1103] +
CVS commit: [netbsd-5] src/sys/arch/sparc64
Module Name:src
Committed By: sborrill
Date: Mon Oct 19 07:25:45 UTC 2009
Modified Files:
src/sys/arch/sparc64/include [netbsd-5]: userret.h
src/sys/arch/sparc64/sparc64 [netbsd-5]: trap.c
Log Message:
Pull up the following revisions(s) (requested by nakayama in ticket #1103):
sys/arch/sparc64/include/userret.h: revision 1.9
sys/arch/sparc64/sparc64/trap.c:revision 1.158
Merge want_ast check in userret() into trap handler, and repeat preempt()
call while want_resched is true. While there remove unnecessary #if 1. This
should fix a performance degradation of disk I/O on heavy load.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 src/sys/arch/sparc64/include/userret.h
cvs rdiff -u -r1.155 -r1.155.4.1 src/sys/arch/sparc64/sparc64/trap.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/sparc64/include/userret.h
diff -u src/sys/arch/sparc64/include/userret.h:1.8 src/sys/arch/sparc64/include/userret.h:1.8.6.1
--- src/sys/arch/sparc64/include/userret.h:1.8 Mon Jun 30 14:12:20 2008
+++ src/sys/arch/sparc64/include/userret.h Mon Oct 19 07:25:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.8 2008/06/30 14:12:20 nakayama Exp $ */
+/* $NetBSD: userret.h,v 1.8.6.1 2009/10/19 07:25:44 sborrill Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -63,14 +63,6 @@
mi_userret(l);
- if (want_ast) {
- want_ast = 0;
- if (l-l_pflag LP_OWEUPC) {
- l-l_pflag = ~LP_OWEUPC;
- ADDUPROF(l);
- }
- }
-
/*
* If profiling, charge recent system time to the trapped pc.
*/
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.155 src/sys/arch/sparc64/sparc64/trap.c:1.155.4.1
--- src/sys/arch/sparc64/sparc64/trap.c:1.155 Wed Oct 15 06:51:19 2008
+++ src/sys/arch/sparc64/sparc64/trap.c Mon Oct 19 07:25:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.155 2008/10/15 06:51:19 wrstuden Exp $ */
+/* $NetBSD: trap.c,v 1.155.4.1 2009/10/19 07:25:44 sborrill Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.155 2008/10/15 06:51:19 wrstuden Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.155.4.1 2009/10/19 07:25:44 sborrill Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -618,12 +618,14 @@
#endif
case T_AST:
-#if 1
- if (want_resched)
+ if (l-l_pflag LP_OWEUPC) {
+ l-l_pflag = ~LP_OWEUPC;
+ ADDUPROF(l);
+ }
+ while (want_resched)
preempt();
want_ast = 0;
-#endif
- break; /* the work is all in userret() */
+ break;
case T_ILLINST:
case T_INST_EXCEPT:
CVS commit: src/sys/secmodel/keylock
Module Name:src
Committed By: cegger
Date: Mon Oct 19 08:20:22 UTC 2009
Modified Files:
src/sys/secmodel/keylock: secmodel_keylock.c
Log Message:
buildfix: define integer before use. i386 ALL kernel builds again
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/secmodel/keylock/secmodel_keylock.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/secmodel/keylock/secmodel_keylock.c
diff -u src/sys/secmodel/keylock/secmodel_keylock.c:1.4 src/sys/secmodel/keylock/secmodel_keylock.c:1.5
--- src/sys/secmodel/keylock/secmodel_keylock.c:1.4 Tue Oct 6 04:28:10 2009
+++ src/sys/secmodel/keylock/secmodel_keylock.c Mon Oct 19 08:20:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_keylock.c,v 1.4 2009/10/06 04:28:10 elad Exp $ */
+/* $NetBSD: secmodel_keylock.c,v 1.5 2009/10/19 08:20:21 cegger Exp $ */
/*-
* Copyright (c) 2009 Marc Balmer m...@msys.ch
* Copyright (c) 2006 Elad Efrat e...@netbsd.org
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: secmodel_keylock.c,v 1.4 2009/10/06 04:28:10 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: secmodel_keylock.c,v 1.5 2009/10/19 08:20:21 cegger Exp $);
#include sys/types.h
#include sys/param.h
@@ -409,7 +409,7 @@
kauth_action_t action, void *cookie, void *arg0,
void *arg1, void *arg2, void *arg3)
{
- int result, kstate;
+ int result, kstate, error;
kstate = keylock_state();
if (kstate == KEYLOCK_ABSENT)
CVS commit: [netbsd-5-0] src/sys/arch/sparc64
Module Name:src
Committed By: sborrill
Date: Mon Oct 19 09:01:43 UTC 2009
Modified Files:
src/sys/arch/sparc64/include [netbsd-5-0]: userret.h
src/sys/arch/sparc64/sparc64 [netbsd-5-0]: trap.c
Log Message:
Pull up the following revisions(s) (requested by nakayama in ticket #1103):
sys/arch/sparc64/include/userret.h: revision 1.9
sys/arch/sparc64/sparc64/trap.c:revision 1.158
Merge want_ast check in userret() into trap handler, and repeat preempt()
call while want_resched is true. While there remove unnecessary #if 1. This
should fix a performance degradation of disk I/O on heavy load.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.12.1 src/sys/arch/sparc64/include/userret.h
cvs rdiff -u -r1.155 -r1.155.8.1 src/sys/arch/sparc64/sparc64/trap.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/sparc64/include/userret.h
diff -u src/sys/arch/sparc64/include/userret.h:1.8 src/sys/arch/sparc64/include/userret.h:1.8.12.1
--- src/sys/arch/sparc64/include/userret.h:1.8 Mon Jun 30 14:12:20 2008
+++ src/sys/arch/sparc64/include/userret.h Mon Oct 19 09:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.8 2008/06/30 14:12:20 nakayama Exp $ */
+/* $NetBSD: userret.h,v 1.8.12.1 2009/10/19 09:01:43 sborrill Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -63,14 +63,6 @@
mi_userret(l);
- if (want_ast) {
- want_ast = 0;
- if (l-l_pflag LP_OWEUPC) {
- l-l_pflag = ~LP_OWEUPC;
- ADDUPROF(l);
- }
- }
-
/*
* If profiling, charge recent system time to the trapped pc.
*/
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.155 src/sys/arch/sparc64/sparc64/trap.c:1.155.8.1
--- src/sys/arch/sparc64/sparc64/trap.c:1.155 Wed Oct 15 06:51:19 2008
+++ src/sys/arch/sparc64/sparc64/trap.c Mon Oct 19 09:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.155 2008/10/15 06:51:19 wrstuden Exp $ */
+/* $NetBSD: trap.c,v 1.155.8.1 2009/10/19 09:01:43 sborrill Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.155 2008/10/15 06:51:19 wrstuden Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.155.8.1 2009/10/19 09:01:43 sborrill Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -618,12 +618,14 @@
#endif
case T_AST:
-#if 1
- if (want_resched)
+ if (l-l_pflag LP_OWEUPC) {
+ l-l_pflag = ~LP_OWEUPC;
+ ADDUPROF(l);
+ }
+ while (want_resched)
preempt();
want_ast = 0;
-#endif
- break; /* the work is all in userret() */
+ break;
case T_ILLINST:
case T_INST_EXCEPT:
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Mon Oct 19 09:02:02 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1103 To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-5.0.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.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.21 src/doc/CHANGES-5.0.2:1.1.2.22 --- src/doc/CHANGES-5.0.2:1.1.2.21 Sun Oct 18 16:06:21 2009 +++ src/doc/CHANGES-5.0.2 Mon Oct 19 09:02:02 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.21 2009/10/18 16:06:21 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.22 2009/10/19 09:02:02 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -397,3 +397,12 @@ - Don't dereference a null pointer for pkg_admin add [joerg, ticket #1075] +sys/arch/sparc64/include/userret.h 1.9 +sys/arch/sparc64/sparc64/trap.c 1.158 + + Merge want_ast check in userret() into trap handler, and + repeat preempt() call while want_resched is true. While + there remove unnecessary #if 1. This should fix a performance + degradation of disk I/O on heavy load. + [nakayama, ticket #1103] +
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: wiz Date: Mon Oct 19 14:35:05 UTC 2009 Modified Files: src/sbin/cgdconfig: cgdconfig.8 Log Message: Document -n, from Jukka Ruohonen in private mail. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sbin/cgdconfig/cgdconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/cgdconfig/cgdconfig.8 diff -u src/sbin/cgdconfig/cgdconfig.8:1.28 src/sbin/cgdconfig/cgdconfig.8:1.29 --- src/sbin/cgdconfig/cgdconfig.8:1.28 Fri Sep 12 16:51:55 2008 +++ src/sbin/cgdconfig/cgdconfig.8 Mon Oct 19 14:35:04 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: cgdconfig.8,v 1.28 2008/09/12 16:51:55 christos Exp $ +.\ $NetBSD: cgdconfig.8,v 1.29 2009/10/19 14:35:04 wiz Exp $ .\ .\ Copyright (c) 2002, The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 12, 2008 +.Dd October 19, 2009 .Dt CGDCONFIG 8 .Os .Sh NAME @@ -100,6 +100,9 @@ Specify the IV method (default: encblkno1). .It Fl k Ar kgmeth Specify the key generation method (default: pkcs5_pbkdf2/sha1). +.It Fl n +Do not actually configure or unconfigure a cryptographic disk +device, but instead report the steps that would be taken. .It Fl o Ar outfile When generating a .Ar paramsfile ,
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Mon Oct 19 14:43:46 UTC 2009 Modified Files: src/sys/rump/librump/rumpkern: rump.3 Log Message: add Arnaud's EuroBSDCon paper To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpkern/rump.3 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.3 diff -u src/sys/rump/librump/rumpkern/rump.3:1.5 src/sys/rump/librump/rumpkern/rump.3:1.6 --- src/sys/rump/librump/rumpkern/rump.3:1.5 Tue Jun 30 15:28:01 2009 +++ src/sys/rump/librump/rumpkern/rump.3 Mon Oct 19 14:43:46 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump.3,v 1.5 2009/06/30 15:28:01 pooka Exp $ +.\ $NetBSD: rump.3,v 1.6 2009/10/19 14:43:46 pooka Exp $ .\ .\ Copyright (c) 2008 Antti Kantee. All rights reserved. .\ @@ -131,6 +131,13 @@ .%P pp. 201-214 .%T Rump File Systems: Kernel Code Reborn .Re +.Rs +.%A Arnaud Ysmal +.%A Antti Kantee +.%D September 2009 +.%B EuroBSDCon 2009 +.%T Fs-utils: File Systems Access Tools for Userland +.Re .Sh HISTORY .Nm first appeared in
CVS commit: src/lib/libp2k
Module Name:src
Committed By: pooka
Date: Mon Oct 19 17:34:07 UTC 2009
Modified Files:
src/lib/libp2k: p2k.c
Log Message:
Default recycle to false in inactive. File system drivers do
not always set it.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/libp2k/p2k.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.26 src/lib/libp2k/p2k.c:1.27
--- src/lib/libp2k/p2k.c:1.26 Sun Oct 18 19:36:41 2009
+++ src/lib/libp2k/p2k.c Mon Oct 19 17:34:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p2k.c,v 1.26 2009/10/18 19:36:41 pooka Exp $ */
+/* $NetBSD: p2k.c,v 1.27 2009/10/19 17:34:07 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -1210,7 +1210,7 @@
{
struct p2k_node *p2n = opc;
struct vnode *vp = OPC2VP(opc);
- bool recycle;
+ bool recycle = false;
int rv;
/* deadfs */
CVS commit: src/lib/libc/compat/gen
Module Name:src Committed By: christos Date: Mon Oct 19 17:52:05 UTC 2009 Modified Files: src/lib/libc/compat/gen: compat___fts13.c compat___fts30.c compat___fts31.c compat___fts32.c compat___fts50.c compat_fts.c Log Message: PR/42201: NAKAJIMA Yoshihiro: fts(3): broken compatibility As new field types were added, we did not provide overrides for older compat versions. This restores compatibility. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compat/gen/compat___fts13.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/gen/compat___fts30.c \ src/lib/libc/compat/gen/compat___fts32.c cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/gen/compat___fts31.c \ src/lib/libc/compat/gen/compat___fts50.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/gen/compat_fts.c 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/compat/gen/compat___fts13.c diff -u src/lib/libc/compat/gen/compat___fts13.c:1.5 src/lib/libc/compat/gen/compat___fts13.c:1.6 --- src/lib/libc/compat/gen/compat___fts13.c:1.5 Sat Jan 10 21:46:24 2009 +++ src/lib/libc/compat/gen/compat___fts13.c Mon Oct 19 13:52:01 2009 @@ -1,10 +1,10 @@ -/* $NetBSD: compat___fts13.c,v 1.5 2009/01/11 02:46:24 christos Exp $ */ +/* $NetBSD: compat___fts13.c,v 1.6 2009/10/19 17:52:01 christos Exp $ */ #include namespace.h #include sys/cdefs.h #include dirent.h -#define __LIBC12_SOURCE__ +#define __LIBC12_SOURCE__ __warn_references(__fts_children13, warning: reference to compatibility __fts_children13(); @@ -26,31 +26,33 @@ #include compat/sys/time.h #include compat/sys/stat.h -#define __fts_stat_t struct stat13 -#define __fts_nlink_t nlink_t +#define __fts_stat_t struct stat13 #define __fts_ino_t u_int32_t #define __fts_length_t u_short #define __fts_number_t long +#define __fts_dev_t uint32_t +#define __fts_level_t short -#define stat __stat13 -#define lstat __lstat13 -#define fstat __fstat13 - -#undef fts_children -#define fts_children __fts_children13 -#undef fts_close -#define fts_close __fts_close13 -#undef fts_open -#define fts_open __fts_open13 -#undef fts_read -#define fts_read __fts_read13 -#undef fts_set -#define fts_set __fts_set13 +#define stat __stat13 +#define lstat __lstat13 +#define fstat __fstat13 + +#undef fts_children +#define fts_children __fts_children13 +#undef fts_close +#define fts_close __fts_close13 +#undef fts_open +#define fts_open __fts_open13 +#undef fts_read +#define fts_read __fts_read13 +#undef fts_set +#define fts_set __fts_set13 #include fts.h #include compat/include/fts.h #define __FTS_COMPAT_TAILINGSLASH #define __FTS_COMPAT_LENGTH +#define __FTS_COMPAT_LEVEL #include gen/fts.c Index: src/lib/libc/compat/gen/compat___fts30.c diff -u src/lib/libc/compat/gen/compat___fts30.c:1.2 src/lib/libc/compat/gen/compat___fts30.c:1.3 --- src/lib/libc/compat/gen/compat___fts30.c:1.2 Thu Jul 27 11:46:30 2006 +++ src/lib/libc/compat/gen/compat___fts30.c Mon Oct 19 13:52:04 2009 @@ -1,9 +1,11 @@ -/* $NetBSD: compat___fts30.c,v 1.2 2006/07/27 15:46:30 christos Exp $ */ +/* $NetBSD: compat___fts30.c,v 1.3 2009/10/19 17:52:04 christos Exp $ */ #include namespace.h #include sys/cdefs.h #include dirent.h +#define __LIBC12_SOURCE__ + __warn_references(__fts_children30, warning: reference to compatibility __fts_children30(); include fts.h for correct reference) @@ -21,25 +23,34 @@ include fts.h for correct reference) #include sys/stat.h +#include compat/sys/time.h +#include compat/sys/stat.h +#define __fts_stat_t struct stat30 #define __fts_length_t u_short #define __fts_number_t long +#define __fts_dev_t uint32_t +#define __fts_level_t short -#undef fts_children -#define fts_children __fts_children30 -#undef fts_close -#define fts_close __fts_close30 -#undef fts_open -#define fts_open __fts_open30 -#undef fts_read -#define fts_read __fts_read30 -#undef fts_set -#define fts_set __fts_set30 +#define stat __stat30 +#define lstat __lstat30 +#define fstat __fstat30 + +#undef fts_children +#define fts_children __fts_children30 +#undef fts_close +#define fts_close __fts_close30 +#undef fts_open +#define fts_open __fts_open30 +#undef fts_read +#define fts_read __fts_read30 +#undef fts_set +#define fts_set __fts_set30 -#define __LIBC12_SOURCE__ #include fts.h #include compat/include/fts.h #define __FTS_COMPAT_LENGTH +#define __FTS_COMPAT_LEVEL #include gen/fts.c Index: src/lib/libc/compat/gen/compat___fts32.c diff -u src/lib/libc/compat/gen/compat___fts32.c:1.2 src/lib/libc/compat/gen/compat___fts32.c:1.3 --- src/lib/libc/compat/gen/compat___fts32.c:1.2 Sat Jan 10 21:46:25 2009 +++ src/lib/libc/compat/gen/compat___fts32.c Mon Oct 19 13:52:05 2009 @@ -1,10 +1,10 @@ -/* $NetBSD: compat___fts32.c,v 1.2 2009/01/11 02:46:25 christos Exp $ */ +/* $NetBSD: compat___fts32.c,v 1.3 2009/10/19 17:52:05 christos Exp $ */
CVS commit: src/sys/fs/cd9660
Module Name:src
Committed By: tsutsui
Date: Mon Oct 19 17:53:36 UTC 2009
Modified Files:
src/sys/fs/cd9660: cd9660_vfsops.c
Log Message:
Apply a similar fix for mount function from ffs_vfsops.c rev 1.186:
Change cd9660_mount, in MNT_UPDATE case, to check dev_t's for equality
instead of just vnode pointers. Fixes erroneous Invalid argument
errors from mount(8) with -u against cd9660 root in the presence of
mfs or tmpfs /dev prepared after initial mountroot.
Tested on QEMU running cobalt Restore CD.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/fs/cd9660/cd9660_vfsops.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/fs/cd9660/cd9660_vfsops.c
diff -u src/sys/fs/cd9660/cd9660_vfsops.c:1.67 src/sys/fs/cd9660/cd9660_vfsops.c:1.68
--- src/sys/fs/cd9660/cd9660_vfsops.c:1.67 Mon Jun 29 05:08:17 2009
+++ src/sys/fs/cd9660/cd9660_vfsops.c Mon Oct 19 17:53:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vfsops.c,v 1.67 2009/06/29 05:08:17 dholland Exp $ */
+/* $NetBSD: cd9660_vfsops.c,v 1.68 2009/10/19 17:53:36 tsutsui Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.67 2009/06/29 05:08:17 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.68 2009/10/19 17:53:36 tsutsui Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -283,7 +283,8 @@
}
} else {
vrele(devvp);
- if (devvp != imp-im_devvp)
+ if (devvp != imp-im_devvp
+ devvp-v_rdev != imp-im_devvp-v_rdev)
return (EINVAL); /* needs translation */
}
return set_statvfs_info(path, UIO_USERSPACE, args-fspec, UIO_USERSPACE,
CVS commit: src
Module Name:src Committed By: snj Date: Mon Oct 19 18:12:37 UTC 2009 Modified Files: src/sys/arch/sparc/stand/bootblk: bootblk.fth src/sys/arch/sparc64/sparc64: cpu_in_cksum.S src/sys/kern: cnmagic.c src/usr.bin/fgen: fgen.1 fgen.h fgen.l Log Message: Move Eduardo Horvath's license to 2 clause. OK e...@. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/stand/bootblk/bootblk.fth cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/sparc64/cpu_in_cksum.S cvs rdiff -u -r1.9 -r1.10 src/sys/kern/cnmagic.c cvs rdiff -u -r1.8 -r1.9 src/usr.bin/fgen/fgen.1 cvs rdiff -u -r1.7 -r1.8 src/usr.bin/fgen/fgen.h cvs rdiff -u -r1.30 -r1.31 src/usr.bin/fgen/fgen.l 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/sparc/stand/bootblk/bootblk.fth diff -u src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.8 src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.9 --- src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.8 Sun Jun 29 14:13:23 2008 +++ src/sys/arch/sparc/stand/bootblk/bootblk.fth Mon Oct 19 18:12:37 2009 @@ -1,4 +1,4 @@ -\ $NetBSD: bootblk.fth,v 1.8 2008/06/29 14:13:23 jdc Exp $ +\ $NetBSD: bootblk.fth,v 1.9 2009/10/19 18:12:37 snj Exp $ \ \ IEEE 1275 Open Firmware Boot Block \ @@ -16,11 +16,6 @@ \ 2. Redistributions in binary form must reproduce the above copyright \ notice, this list of conditions and the following disclaimer in the \ documentation and/or other materials provided with the distribution. -\ 3. All advertising materials mentioning features or use of this software -\ must display the following acknowledgement: -\ This product includes software developed by Eduardo Horvath. -\ 4. The name of the author may not be used to endorse or promote products -\ derived from this software without specific prior written permission \ \ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR \ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/sparc64/sparc64/cpu_in_cksum.S diff -u src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.1 src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.2 --- src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.1 Sun Feb 3 13:27:12 2008 +++ src/sys/arch/sparc64/sparc64/cpu_in_cksum.S Mon Oct 19 18:12:37 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_in_cksum.S,v 1.1 2008/02/03 13:27:12 martin Exp $ */ +/* $NetBSD: cpu_in_cksum.S,v 1.2 2009/10/19 18:12:37 snj Exp $ */ /* * Copyright (c) 2001 Eduardo Horvath @@ -11,11 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Eduardo Horvath. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/kern/cnmagic.c diff -u src/sys/kern/cnmagic.c:1.9 src/sys/kern/cnmagic.c:1.10 --- src/sys/kern/cnmagic.c:1.9 Wed Nov 1 10:17:58 2006 +++ src/sys/kern/cnmagic.c Mon Oct 19 18:12:37 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cnmagic.c,v 1.9 2006/11/01 10:17:58 yamt Exp $ */ +/* $NetBSD: cnmagic.c,v 1.10 2009/10/19 18:12:37 snj Exp $ */ /* * Copyright (c) 2000 Eduardo Horvath @@ -12,11 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Eduardo Horvath. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -31,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cnmagic.c,v 1.9 2006/11/01 10:17:58 yamt Exp $); +__KERNEL_RCSID(0, $NetBSD: cnmagic.c,v 1.10 2009/10/19 18:12:37 snj Exp $); #include sys/param.h #include sys/systm.h Index: src/usr.bin/fgen/fgen.1 diff -u src/usr.bin/fgen/fgen.1:1.8 src/usr.bin/fgen/fgen.1:1.9 --- src/usr.bin/fgen/fgen.1:1.8 Fri Feb 8 01:36:22 2002 +++ src/usr.bin/fgen/fgen.1 Mon Oct 19 18:12:37 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fgen.1,v 1.8 2002/02/08 01:36:22
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Mon Oct 19 18:23:29 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: Eduardo Horvath's ad clause is no more. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.57 src/distrib/notes/common/legal.common:1.58 --- src/distrib/notes/common/legal.common:1.57 Sun Oct 18 18:23:29 2009 +++ src/distrib/notes/common/legal.common Mon Oct 19 18:23:28 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.57 2009/10/18 18:23:29 snj Exp $ +.\ $NetBSD: legal.common,v 1.58 2009/10/19 18:23:28 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -208,8 +208,6 @@ .It This product includes software developed by Dean Huxley. .It -This product includes software developed by Eduardo Horvath. -.It This product includes software developed by Eric S. Hvozda. .It This product includes software developed by Eric S. Raymond
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Mon Oct 19 19:02:21 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: bouyer's ad clause is no more. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.58 src/distrib/notes/common/legal.common:1.59 --- src/distrib/notes/common/legal.common:1.58 Mon Oct 19 18:23:28 2009 +++ src/distrib/notes/common/legal.common Mon Oct 19 19:02:21 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.58 2009/10/19 18:23:28 snj Exp $ +.\ $NetBSD: legal.common,v 1.59 2009/10/19 19:02:21 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -343,8 +343,6 @@ This product includes software developed by MINOURA Makoto, Takuya Harakawa. .It -This product includes software developed by Manuel Bouyer. -.It This product includes software developed by Marc Horowitz. .It This product includes software developed by Marcus Comstedt.
CVS commit: src/distrib/notes
Module Name:src Committed By: snj Date: Mon Oct 19 19:07:40 UTC 2009 Modified Files: src/distrib/notes/mac68k: legal src/distrib/notes/sparc: legal Log Message: Remove duplicates of ad clauses from the Alice Group (which is already in legal.common, where it belongs). To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/notes/mac68k/legal cvs rdiff -u -r1.7 -r1.8 src/distrib/notes/sparc/legal Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/mac68k/legal diff -u src/distrib/notes/mac68k/legal:1.14 src/distrib/notes/mac68k/legal:1.15 --- src/distrib/notes/mac68k/legal:1.14 Fri Jul 19 07:17:52 2002 +++ src/distrib/notes/mac68k/legal Mon Oct 19 19:07:39 2009 @@ -1,8 +1,6 @@ -.\ $NetBSD: legal,v 1.14 2002/07/19 07:17:52 scottr Exp $ +.\ $NetBSD: legal,v 1.15 2009/10/19 19:07:39 snj Exp $ . .It -This product includes software developed by the Alice Group. -.It This product includes software developed by Allen Briggs. .It This product includes software developed by Bradley A. Grantham. Index: src/distrib/notes/sparc/legal diff -u src/distrib/notes/sparc/legal:1.7 src/distrib/notes/sparc/legal:1.8 --- src/distrib/notes/sparc/legal:1.7 Mon May 20 23:48:49 2002 +++ src/distrib/notes/sparc/legal Mon Oct 19 19:07:39 2009 @@ -1,8 +1,6 @@ -.\ $NetBSD: legal,v 1.7 2002/05/20 23:48:49 itojun Exp $ +.\ $NetBSD: legal,v 1.8 2009/10/19 19:07:39 snj Exp $ . .\ NOTE: This file is shared between the sparc and the sparc64 . .It -This product includes software developed by the Alice Group. -.It This product includes software developed by David Miller.
CVS commit: src/sys/fs/smbfs
Module Name:src
Committed By: pooka
Date: Mon Oct 19 19:12:06 UTC 2009
Modified Files:
src/sys/fs/smbfs: smbfs_node.c
Log Message:
Set recycle to false along with a comment screaming that it should
be set properly to recycle unused vnodes immediately.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/fs/smbfs/smbfs_node.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/fs/smbfs/smbfs_node.c
diff -u src/sys/fs/smbfs/smbfs_node.c:1.41 src/sys/fs/smbfs/smbfs_node.c:1.42
--- src/sys/fs/smbfs/smbfs_node.c:1.41 Thu Jul 2 16:17:52 2009
+++ src/sys/fs/smbfs/smbfs_node.c Mon Oct 19 19:12:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_node.c,v 1.41 2009/07/02 16:17:52 njoly Exp $ */
+/* $NetBSD: smbfs_node.c,v 1.42 2009/10/19 19:12:06 pooka Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_node.c,v 1.41 2009/07/02 16:17:52 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_node.c,v 1.42 2009/10/19 19:12:06 pooka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -278,6 +278,7 @@
{
struct vop_inactive_args /* {
struct vnode *a_vp;
+ bool *a_recycle;
} */ *ap = v;
struct lwp *l = curlwp;
kauth_cred_t cred = l-l_cred;
@@ -305,6 +306,9 @@
smbfs_attr_cacheremove(vp);
}
VOP_UNLOCK(vp, 0);
+
+ *ap-a_recycle = false; /* XXX: should set the value properly */
+
return (0);
}
/*
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Mon Oct 19 19:13:13 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: David Miller's entry is already in ../sparc/legal, where it belongs. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.59 src/distrib/notes/common/legal.common:1.60 --- src/distrib/notes/common/legal.common:1.59 Mon Oct 19 19:02:21 2009 +++ src/distrib/notes/common/legal.common Mon Oct 19 19:13:13 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.59 2009/10/19 19:02:21 snj Exp $ +.\ $NetBSD: legal.common,v 1.60 2009/10/19 19:13:13 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -204,8 +204,6 @@ .It This product includes software developed by Darrin B. Jewell .It -This product includes software developed by David Miller. -.It This product includes software developed by Dean Huxley. .It This product includes software developed by Eric S. Hvozda.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: christos
Date: Mon Oct 19 22:07:29 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
treat sun2 like the other losing platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/rump/librump/rumpkern/Makefile.rumpkern
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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.53 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.54
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.53 Thu Oct 15 20:14:53 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Mon Oct 19 18:07:29 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.53 2009/10/16 00:14:53 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.54 2009/10/19 22:07:29 christos Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -105,7 +105,7 @@
#
.if ${MACHINE_CPU} == arm || ${MACHINE_CPU} == hppa \
|| ${MACHINE_CPU} == mips || ${MACHINE_CPU} == sh3 \
-|| ${MACHINE_CPU} == vax
+|| ${MACHINE_CPU} == vax || ${MACHINE_ARCH} == m68000
CPPFLAGS+= -I${RUMPTOP}/../../common/lib/libc/atomic
SRCS+= atomic_cas_generic.c
.endif
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Mon Oct 19 22:31:47 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: vm.c
Log Message:
remove stale uvm_readahead() stub
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/rump/librump/rumpkern/vm.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/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.62 src/sys/rump/librump/rumpkern/vm.c:1.63
--- src/sys/rump/librump/rumpkern/vm.c:1.62 Fri Oct 16 00:14:53 2009
+++ src/sys/rump/librump/rumpkern/vm.c Mon Oct 19 22:31:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.62 2009/10/16 00:14:53 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.63 2009/10/19 22:31:47 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.62 2009/10/16 00:14:53 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.63 2009/10/19 22:31:47 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -518,14 +518,6 @@
/* nada for now */
}
-int
-uvm_readahead(struct uvm_object *uobj, off_t off, off_t size)
-{
-
- /* nada for now */
- return 0;
-}
-
/*
* Kmem
*/
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Mon Oct 19 22:35:11 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
__weak_alias for uvm_readahead() since it's used also in sys_descrip.c
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 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.126 src/sys/rump/librump/rumpkern/rump.c:1.127
--- src/sys/rump/librump/rumpkern/rump.c:1.126 Fri Oct 16 00:14:53 2009
+++ src/sys/rump/librump/rumpkern/rump.c Mon Oct 19 22:35:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.126 2009/10/16 00:14:53 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.127 2009/10/19 22:35:11 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.126 2009/10/16 00:14:53 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.127 2009/10/19 22:35:11 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -125,6 +125,7 @@
__weak_alias(biodone,rump__unavailable);
__weak_alias(sopoll,rump__unavailable);
+__weak_alias(uvm_readahead,rump__unavailable);
void rump__unavailable_vfs_panic(void);
void rump__unavailable_vfs_panic() {panic(vfs component not available);}
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: joerg Date: Mon Oct 19 22:38:56 UTC 2009 Modified Files: src/lib/libc/stdlib: getsubopt.3 Log Message: Fix header to include. From Kristaps Dzonsons. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/stdlib/getsubopt.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/stdlib/getsubopt.3 diff -u src/lib/libc/stdlib/getsubopt.3:1.11 src/lib/libc/stdlib/getsubopt.3:1.12 --- src/lib/libc/stdlib/getsubopt.3:1.11 Thu Aug 7 16:43:40 2003 +++ src/lib/libc/stdlib/getsubopt.3 Mon Oct 19 22:38:56 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getsubopt.3,v 1.11 2003/08/07 16:43:40 agc Exp $ +.\ $NetBSD: getsubopt.3,v 1.12 2009/10/19 22:38:56 joerg Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)getsubopt.3 8.1 (Berkeley) 6/9/93 .\ -.Dd June 9, 1993 +.Dd October 19, 2009 .Dt GETSUBOPT 3 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In stdlib.h +.In unistd.h .Vt extern char *suboptarg .Ft int .Fn getsubopt char **optionp char * const *tokens char **valuep
CVS commit: src/share/man/man4
Module Name:src Committed By: dyoung Date: Mon Oct 19 22:49:44 UTC 2009 Modified Files: src/share/man/man4: isv.4 Log Message: Add missing copyright notice, pointed out by rm...@. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/isv.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/isv.4 diff -u src/share/man/man4/isv.4:1.1 src/share/man/man4/isv.4:1.2 --- src/share/man/man4/isv.4:1.1 Wed Apr 2 01:34:36 2008 +++ src/share/man/man4/isv.4 Mon Oct 19 22:49:44 2009 @@ -1,4 +1,10 @@ -.\ $NetBSD: isv.4,v 1.1 2008/04/02 01:34:36 dyoung Exp $ +.\ $NetBSD: isv.4,v 1.2 2009/10/19 22:49:44 dyoung Exp $ +.\ +.\ Copyright (c) 2008 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD +.\ Foundation by David Young. .\ .\ Redistribution and use in source and binary forms, with or .\ without modification, are permitted provided that the following
CVS commit: src
Module Name:src Committed By: rmind Date: Mon Oct 19 23:19:40 UTC 2009 Modified Files: src/dist/tcpdump: cpack.c cpack.h ieee802_11_radio.h src/dist/wpa/hostapd: radiotap.h src/share/man/man3: bits.3 src/share/man/man4: atw.4 src/share/man/man4/man4.i386: cmos.4 elanpar.4 elanpex.4 geodewdog.4 src/share/man/man9: in_getifa.9 rssadapt.9 src/sys/arch/i386/isa: cmos.c src/sys/arch/i386/pci: geode.c geodereg.h geodewdg.c src/sys/arch/mips/adm5120: adm5120_extio_space.c src/sys/arch/mips/adm5120/dev: admgpio.c admpci.c admwdog.c wdc_extio.c src/sys/arch/mips/adm5120/include: adm5120_extiovar.h adm5120_pcivar.h src/sys/dev/cardbus: if_rtw_cardbus.c src/sys/dev/ic: al2210reg.h ath_netbsd.c ath_netbsd.h hfa3861areg.h max2820reg.h rf3000reg.h rtw.c rtwphy.c rtwphy.h rtwphyio.c rtwphyio.h rtwreg.h rtwvar.h sa2400reg.h si4136reg.h src/sys/net80211: ieee80211_radiotap.h ieee80211_rssadapt.c ieee80211_rssadapt.h ieee80211_sysctl.h src/sys/netinet: in_selsrc.c Log Message: Drop 3rd and 4th clauses from David Young's license. Reviewed and approved by dyoung@ (copyright holder). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/dist/tcpdump/cpack.c src/dist/tcpdump/cpack.h cvs rdiff -u -r1.3 -r1.4 src/dist/tcpdump/ieee802_11_radio.h cvs rdiff -u -r1.1.1.1 -r1.2 src/dist/wpa/hostapd/radiotap.h cvs rdiff -u -r1.3 -r1.4 src/share/man/man3/bits.3 cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/atw.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.i386/cmos.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.i386/elanpar.4 \ src/share/man/man4/man4.i386/elanpex.4 \ src/share/man/man4/man4.i386/geodewdog.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/in_getifa.9 \ src/share/man/man9/rssadapt.9 cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/isa/cmos.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/pci/geode.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/pci/geodereg.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/pci/geodewdg.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_extio_space.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/adm5120/dev/admgpio.c \ src/sys/arch/mips/adm5120/dev/admpci.c \ src/sys/arch/mips/adm5120/dev/admwdog.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/dev/wdc_extio.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/include/adm5120_extiovar.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/adm5120/include/adm5120_pcivar.h cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/if_rtw_cardbus.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/al2210reg.h cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/ath_netbsd.c \ src/sys/dev/ic/rtwphyio.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/ath_netbsd.h cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/hfa3861areg.h \ src/sys/dev/ic/rtwphyio.h cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/max2820reg.h \ src/sys/dev/ic/sa2400reg.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/rf3000reg.h src/sys/dev/ic/rtwphy.h \ src/sys/dev/ic/si4136reg.h cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ic/rtw.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/rtwphy.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/rtwreg.h cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ic/rtwvar.h cvs rdiff -u -r1.20 -r1.21 src/sys/net80211/ieee80211_radiotap.h cvs rdiff -u -r1.16 -r1.17 src/sys/net80211/ieee80211_rssadapt.c cvs rdiff -u -r1.6 -r1.7 src/sys/net80211/ieee80211_rssadapt.h cvs rdiff -u -r1.8 -r1.9 src/sys/net80211/ieee80211_sysctl.h cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/in_selsrc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/tcpdump/cpack.c diff -u src/dist/tcpdump/cpack.c:1.2 src/dist/tcpdump/cpack.c:1.3 --- src/dist/tcpdump/cpack.c:1.2 Tue Jul 24 11:53:37 2007 +++ src/dist/tcpdump/cpack.c Mon Oct 19 23:19:37 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpack.c,v 1.2 2007/07/24 11:53:37 drochner Exp $ */ +/* $NetBSD: cpack.c,v 1.3 2009/10/19 23:19:37 rmind Exp $ */ /*- * Copyright (c) 2003, 2004 David Young. All rights reserved. @@ -11,9 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. The name of David Young may not be used to endorse or promote - *products derived from this software without specific prior - *written permission. * * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, Index: src/dist/tcpdump/cpack.h diff -u src/dist/tcpdump/cpack.h:1.2 src/dist/tcpdump/cpack.h:1.3 --- src/dist/tcpdump/cpack.h:1.2 Tue Jul 24 11:53:37 2007 +++ src/dist/tcpdump/cpack.h Mon Oct 19 23:19:38 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpack.h,v 1.2 2007/07/24 11:53:37 drochner
CVS commit: src/usr.sbin/ypserv/ypserv
Module Name:src Committed By: snj Date: Mon Oct 19 23:25:43 UTC 2009 Modified Files: src/usr.sbin/ypserv/ypserv: ypserv_db.c Log Message: Remove third and fourth clauses, as was done upstream in revision 1.25. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/ypserv/ypserv/ypserv_db.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/ypserv/ypserv/ypserv_db.c diff -u src/usr.sbin/ypserv/ypserv/ypserv_db.c:1.20 src/usr.sbin/ypserv/ypserv/ypserv_db.c:1.21 --- src/usr.sbin/ypserv/ypserv/ypserv_db.c:1.20 Sun Apr 19 06:06:41 2009 +++ src/usr.sbin/ypserv/ypserv/ypserv_db.c Mon Oct 19 23:25:43 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ypserv_db.c,v 1.20 2009/04/19 06:06:41 lukem Exp $ */ +/* $NetBSD: ypserv_db.c,v 1.21 2009/10/19 23:25:43 snj Exp $ */ /* * Copyright (c) 1994 Mats O Jansson m...@stacken.kth.se @@ -13,12 +13,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Mats O Jansson - * and Charles D. Cranor. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -35,7 +29,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: ypserv_db.c,v 1.20 2009/04/19 06:06:41 lukem Exp $); +__RCSID($NetBSD: ypserv_db.c,v 1.21 2009/10/19 23:25:43 snj Exp $); #endif /*
CVS commit: src/share/man/man4
Module Name:src Committed By: dyoung Date: Mon Oct 19 23:28:02 UTC 2009 Modified Files: src/share/man/man4: isv.4 Log Message: Delete clauses 3 and 4. Thanks rmind@ for pointing out my mistake. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/isv.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/isv.4 diff -u src/share/man/man4/isv.4:1.2 src/share/man/man4/isv.4:1.3 --- src/share/man/man4/isv.4:1.2 Mon Oct 19 22:49:44 2009 +++ src/share/man/man4/isv.4 Mon Oct 19 23:28:02 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: isv.4,v 1.2 2009/10/19 22:49:44 dyoung Exp $ +.\ $NetBSD: isv.4,v 1.3 2009/10/19 23:28:02 dyoung Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -15,14 +15,6 @@ .\copyright notice, this list of conditions and the following .\disclaimer in the documentation and/or other materials .\provided with the distribution. -.\ 3. All advertising materials mentioning features or use of this -.\software must display the following acknowledgement: -.\This product includes software developed by the NetBSD -.\Foundation, Inc. and its contributors. -.\ 4. Neither the name of The NetBSD Foundation nor the names of -.\its contributors may be used to endorse or promote products -.\derived from this software without specific prior written -.\permission. .\ .Dd April 1, 2008 .Dt isv 4
CVS commit: src/share/man/man4
Module Name:src Committed By: dyoung Date: Mon Oct 19 23:29:40 UTC 2009 Modified Files: src/share/man/man4: isv.4 Log Message: Add missing text disclaiming any warranty, as pointed about by rm...@. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/isv.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/isv.4 diff -u src/share/man/man4/isv.4:1.3 src/share/man/man4/isv.4:1.4 --- src/share/man/man4/isv.4:1.3 Mon Oct 19 23:28:02 2009 +++ src/share/man/man4/isv.4 Mon Oct 19 23:29:40 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: isv.4,v 1.3 2009/10/19 23:28:02 dyoung Exp $ +.\ $NetBSD: isv.4,v 1.4 2009/10/19 23:29:40 dyoung Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -16,6 +16,18 @@ .\disclaimer in the documentation and/or other materials .\provided with the distribution. .\ +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. +.\ .Dd April 1, 2008 .Dt isv 4 .Os
CVS commit: src/sys/rump/net/rumptest
Module Name:src
Committed By: pooka
Date: Tue Oct 20 00:25:26 UTC 2009
Modified Files:
src/sys/rump/net/rumptest: rumptest_net.c
Log Message:
fix sign-compare warnings
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/rumptest/rumptest_net.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/net/rumptest/rumptest_net.c
diff -u src/sys/rump/net/rumptest/rumptest_net.c:1.11 src/sys/rump/net/rumptest/rumptest_net.c:1.12
--- src/sys/rump/net/rumptest/rumptest_net.c:1.11 Wed Oct 14 19:14:39 2009
+++ src/sys/rump/net/rumptest/rumptest_net.c Tue Oct 20 00:25:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumptest_net.c,v 1.11 2009/10/14 19:14:39 pooka Exp $ */
+/* $NetBSD: rumptest_net.c,v 1.12 2009/10/20 00:25:26 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -75,7 +75,7 @@
struct sockaddr_in *sin;
struct sockaddr_in sinstore;
struct ifaliasreq ia;
- size_t len;
+ ssize_t len;
struct {
struct rt_msghdr m_rtm;
uint8_t m_space;
@@ -203,7 +203,7 @@
strcpy(buf, GET / HTTP/1.0\n\n);
n = rump_sys_write(s, buf, strlen(buf));
- if (n != strlen(buf))
+ if (n != (ssize_t)strlen(buf))
err(1, wrote only %zd vs. %zu\n,
n, strlen(buf));
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Tue Oct 20 00:32:11 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: Remove the Mats O Jansson and Charles D. Cranor acknowledgement. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.60 src/distrib/notes/common/legal.common:1.61 --- src/distrib/notes/common/legal.common:1.60 Mon Oct 19 19:13:13 2009 +++ src/distrib/notes/common/legal.common Tue Oct 20 00:32:11 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.60 2009/10/19 19:13:13 snj Exp $ +.\ $NetBSD: legal.common,v 1.61 2009/10/20 00:32:11 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -358,9 +358,6 @@ .It This product includes software developed by Masaru Oki. .It -This product includes software developed by Mats O Jansson -and Charles D. Cranor. -.It This product includes software developed by Mats O Jansson. .It This product includes software developed by Matt DeBergalis
CVS commit: src/external/bsd/fetch/lib
Module Name:src Committed By: joerg Date: Tue Oct 20 01:21:28 UTC 2009 Modified Files: src/external/bsd/fetch/lib: Makefile Log Message: Fix RCS ID To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/fetch/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/fetch/lib/Makefile diff -u src/external/bsd/fetch/lib/Makefile:1.4 src/external/bsd/fetch/lib/Makefile:1.5 --- src/external/bsd/fetch/lib/Makefile:1.4 Mon Jul 20 15:46:51 2009 +++ src/external/bsd/fetch/lib/Makefile Tue Oct 20 01:21:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD +# $NetBSD: Makefile,v 1.5 2009/10/20 01:21:28 joerg Exp $ LIB= fetch SRCS= fetch.c common.c ftp.c http.c file.c
CVS commit: [netbsd-5] src/share/mk
Module Name:src
Committed By: snj
Date: Tue Oct 20 01:28:59 UTC 2009
Modified Files:
src/share/mk [netbsd-5]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1107):
share/mk/bsd.own.mk: revision 1.571
add sunleo
To generate a diff of this commit:
cvs rdiff -u -r1.542.2.10 -r1.542.2.11 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.542.2.10 src/share/mk/bsd.own.mk:1.542.2.11
--- src/share/mk/bsd.own.mk:1.542.2.10 Thu Sep 17 04:24:42 2009
+++ src/share/mk/bsd.own.mk Tue Oct 20 01:28:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.542.2.10 2009/09/17 04:24:42 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.542.2.11 2009/10/20 01:28:59 snj Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -872,8 +872,8 @@
.for _v in \
ag10e apm ark ast ati chips cirrus crime cyrix glint i128 i740 imstt \
intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 radeonhd \
- rendition s3 s3virge savage siliconmotion sis sunffb suncg6 suntcx \
- tdfx tga trident tseng vesa vga via vmware wsfb
+ rendition s3 s3virge savage siliconmotion sis sunffb suncg6 sunleo \
+ suntcx tdfx tga trident tseng vesa vga via vmware wsfb
X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist
.endfor
CVS commit: src/distrib/notes/acorn26
Module Name:src Committed By: snj Date: Tue Oct 20 01:41:44 UTC 2009 Modified Files: src/distrib/notes/acorn26: legal Log Message: Mark Brinicombe's acknowledgement (well, this variety of it) is in legal.common, where it belongs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/notes/acorn26/legal Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/acorn26/legal diff -u src/distrib/notes/acorn26/legal:1.2 src/distrib/notes/acorn26/legal:1.3 --- src/distrib/notes/acorn26/legal:1.2 Mon May 20 23:48:40 2002 +++ src/distrib/notes/acorn26/legal Tue Oct 20 01:41:44 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal,v 1.2 2002/05/20 23:48:40 itojun Exp $ +.\ $NetBSD: legal,v 1.3 2009/10/20 01:41:44 snj Exp $ . .\ db_disasm.c locore.S disklabel.h disklabel_acorn.h fp.h frame.h signal.h .\ undefined.h iocreg.h iic.h rtc.c podulebus.h @@ -6,9 +6,5 @@ .It This product includes software developed by Brini. .It -.\softintr.c vm_machdep.c ascvar.h -This product includes software developed by Mark Brinicombe for the -NetBSD Project. -.It .\ param.h This product includes software developed by the RiscBSD team.
CVS commit: [netbsd-5] src/lib/libc/stdlib
Module Name:src Committed By: snj Date: Tue Oct 20 01:59:46 UTC 2009 Modified Files: src/lib/libc/stdlib [netbsd-5]: getsubopt.3 Log Message: Pull up following revision(s) (requested by joerg in ticket #1106): lib/libc/stdlib/getsubopt.3: revision 1.12 Fix header to include. From Kristaps Dzonsons. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.38.1 src/lib/libc/stdlib/getsubopt.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/stdlib/getsubopt.3 diff -u src/lib/libc/stdlib/getsubopt.3:1.11 src/lib/libc/stdlib/getsubopt.3:1.11.38.1 --- src/lib/libc/stdlib/getsubopt.3:1.11 Thu Aug 7 16:43:40 2003 +++ src/lib/libc/stdlib/getsubopt.3 Tue Oct 20 01:59:46 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getsubopt.3,v 1.11 2003/08/07 16:43:40 agc Exp $ +.\ $NetBSD: getsubopt.3,v 1.11.38.1 2009/10/20 01:59:46 snj Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)getsubopt.3 8.1 (Berkeley) 6/9/93 .\ -.Dd June 9, 1993 +.Dd October 19, 2009 .Dt GETSUBOPT 3 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In stdlib.h +.In unistd.h .Vt extern char *suboptarg .Ft int .Fn getsubopt char **optionp char * const *tokens char **valuep
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Tue Oct 20 02:01:40 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1106 and 1107. To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-5.1 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 diff -u src/doc/CHANGES-5.1:1.1.2.123 src/doc/CHANGES-5.1:1.1.2.124 --- src/doc/CHANGES-5.1:1.1.2.123 Mon Oct 19 07:24:44 2009 +++ src/doc/CHANGES-5.1 Tue Oct 20 02:01:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.123 2009/10/19 07:24:44 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.124 2009/10/20 02:01:40 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14473,3 +14473,13 @@ degradation of disk I/O on heavy load. [nakayama, ticket #1103] +share/mk/bsd.own.mk 1.571 + + Add sunleo. Should have been part of ticket 1052. + [rmind, ticket #1107] + +lib/libc/stdlib/getsubopt.3 1.12 + + Fix header to include. + [joerg, ticket #1106] +
CVS commit: src/share/examples/rump/img2cgd
Module Name:src
Committed By: pooka
Date: Tue Oct 20 02:05:45 UTC 2009
Modified Files:
src/share/examples/rump/img2cgd: img2cgd.c
Log Message:
fix warnings, update interface to use rump_pub
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/examples/rump/img2cgd/img2cgd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/rump/img2cgd/img2cgd.c
diff -u src/share/examples/rump/img2cgd/img2cgd.c:1.2 src/share/examples/rump/img2cgd/img2cgd.c:1.3
--- src/share/examples/rump/img2cgd/img2cgd.c:1.2 Tue Sep 8 21:51:33 2009
+++ src/share/examples/rump/img2cgd/img2cgd.c Tue Oct 20 02:05:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: img2cgd.c,v 1.2 2009/09/08 21:51:33 pooka Exp $ */
+/* $NetBSD: img2cgd.c,v 1.3 2009/10/20 02:05:45 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -29,6 +29,7 @@
#include sys/param.h
#include assert.h
+#include err.h
#include fcntl.h
#include stdio.h
#include stdlib.h
@@ -38,6 +39,8 @@
#include rump/rump.h
#include rump/rump_syscalls.h
+#include cgdconfig.h
+
/*
* We really should use disklabel. However, for the time being,
* use a endian independent magic number at offset == 0 and a
@@ -96,7 +99,7 @@
int
main(int argc, char *argv[])
{
- const char *the_argv[10];
+ char *the_argv[10];
const char *cgd_file, *img_file;
struct stat sb_cgd, sb_file;
off_t nbytes;
@@ -179,16 +182,16 @@
}
rump_init();
- if ((error = rump_etfs_register(/cryptfile, cgd_file,
+ if ((error = rump_pub_etfs_register(/cryptfile, cgd_file,
RUMP_ETFS_BLK)) != 0) {
printf(etfs: %d\n, error);
exit(1);
}
- the_argv[0] = cgdconfig;
- the_argv[1] = cgd0;
- the_argv[2] = /cryptfile;
- the_argv[3] = ./cgd.conf;
+ the_argv[0] = strdup(cgdconfig);
+ the_argv[1] = strdup(cgd0);
+ the_argv[2] = strdup(/cryptfile);
+ the_argv[3] = strdup(./cgd.conf);
the_argv[4] = NULL;
error = cgdconfig(4, the_argv);
if (error) {
CVS commit: src/usr.sbin/puffs/rump_smbfs
Module Name:src Committed By: pooka Date: Tue Oct 20 02:14:12 UTC 2009 Modified Files: src/usr.sbin/puffs/rump_smbfs: rump_smbfs.c Log Message: g/c unused variable To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.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/puffs/rump_smbfs/rump_smbfs.c diff -u src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.4 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.5 --- src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.4 Sun Oct 18 19:58:04 2009 +++ src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c Tue Oct 20 02:14:12 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_smbfs.c,v 1.4 2009/10/18 19:58:04 pooka Exp $ */ +/* $NetBSD: rump_smbfs.c,v 1.5 2009/10/20 02:14:12 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -56,7 +56,7 @@ struct smbfs_args args; char canon_dev[MAXPATHLEN], canon_dir[MAXPATHLEN]; struct p2k_mount *p2m; - int rv, mntflags; + int mntflags; setprogname(argv[0]);
CVS commit: src/usr.sbin/puffs/rump_syspuffs
Module Name:src Committed By: pooka Date: Tue Oct 20 02:14:55 UTC 2009 Modified Files: src/usr.sbin/puffs/rump_syspuffs: rump_syspuffs.c Log Message: use rump_pub interface name To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.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/puffs/rump_syspuffs/rump_syspuffs.c diff -u src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c:1.9 src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c:1.10 --- src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c:1.9 Wed Apr 15 08:36:21 2009 +++ src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c Tue Oct 20 02:14:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syspuffs.c,v 1.9 2009/04/15 08:36:21 pooka Exp $ */ +/* $NetBSD: rump_syspuffs.c,v 1.10 2009/10/20 02:14:54 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -148,6 +148,6 @@ *pflags |= PUFFS_KFLAG_NOCACHE; *pflags = ~PUFFS_FLAG_BUILDPATH; - rv = rump_syspuffs_glueinit(sv[1], kargs-pa_fd); + rv = rump_pub_syspuffs_glueinit(sv[1], kargs-pa_fd); assert(rv == 0); }
CVS commit: src/lib/libc/sys
Module Name:src
Committed By: jnemeth
Date: Tue Oct 20 04:41:28 UTC 2009
Modified Files:
src/lib/libc/sys: Makefile.inc
Added Files:
src/lib/libc/sys: modctl.2
Log Message:
First pass at a manpage for modctl(2) (hi ad!).
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/lib/libc/sys/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/sys/modctl.2
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/sys/Makefile.inc
diff -u src/lib/libc/sys/Makefile.inc:1.201 src/lib/libc/sys/Makefile.inc:1.202
--- src/lib/libc/sys/Makefile.inc:1.201 Fri Apr 10 23:14:58 2009
+++ src/lib/libc/sys/Makefile.inc Tue Oct 20 04:41:28 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.201 2009/04/10 23:14:58 christos Exp $
+# $NetBSD: Makefile.inc,v 1.202 2009/10/20 04:41:28 jnemeth Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
# sys sources
@@ -219,7 +219,8 @@
_lwp_getname.2 _lwp_getprivate.2 \
_lwp_park.2 _lwp_unpark.2 _lwp_unpark_all.2 \
mkdir.2 mkfifo.2 mknod.2 \
- madvise.2 mincore.2 minherit.2 mlock.2 mlockall.2 mmap.2 mount.2 \
+ madvise.2 mincore.2 minherit.2 mlock.2 mlockall.2 mmap.2 modctl.2 \
+ mount.2 \
mprotect.2 mremap.2 msgctl.2 msgget.2 msgrcv.2 msgsnd.2 msync.2 \
munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 pathconf.2 pipe.2 \
pmc_control.2 poll.2 posix_fadvise.2 profil.2 ptrace.2 quotactl.2 \
Added files:
Index: src/lib/libc/sys/modctl.2
diff -u /dev/null src/lib/libc/sys/modctl.2:1.1
--- /dev/null Tue Oct 20 04:41:28 2009
+++ src/lib/libc/sys/modctl.2 Tue Oct 20 04:41:28 2009
@@ -0,0 +1,235 @@
+.\ $NetBSD: modctl.2,v 1.1 2009/10/20 04:41:28 jnemeth Exp $
+.\
+.\ Copyright (c) 2009 The NetBSD Foundation, Inc.
+.\ All rights reserved.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\ 1. Redistributions of source code must retain the above copyright
+.\notice, this list of conditions and the following disclaimer.
+.\ 2. Redistributions in binary form must reproduce the above copyright
+.\notice, this list of conditions and the following disclaimer in the
+.\documentation and/or other materials provided with the distribution.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\ POSSIBILITY OF SUCH DAMAGE.
+.\
+.Dd October 19, 2009
+.Dt MODCTL 2
+.Os
+.Sh NAME
+.Nm modctl
+.Nd module control
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/module.h
+.Ft int
+.Fn modctl int operation void * argp
+.Sh DESCRIPTION
+.Fn modctl
+provides for control over modules.
+The argument
+.Fa operation
+is one of
+.Dv MODCTL_LOAD ,
+.Dv MODCTL_UNLOAD ,
+or
+.Dv MODCTL_STAT .
+The argument
+.Fa argp
+depends on the
+.Fa operation
+to be performed.
+.Pp
+Operations are:
+.Bl -tag -width MODCTL_UNLOAD
+.It Dv MODCTL_LOAD
+Load a module.
+The
+.Fa argp
+should be:
+.Bd -literal
+typedef struct modctl_load {
+const char *ml_filename; /* the name/path of the module to load */
+
+#define MODCTL_NO_PROP 0x2 /* don't load \*[Lt]module\*[Gt].prop */
+#define MODCTL_LOAD_FORCE 0x1 /* ignore kernel version mismatch */
+int ml_flags;
+
+const char *ml_props; /* externalised dictionary to pass to module */
+size_t ml_propslen; /* length of dictionary */
+} modctl_load_t;
+.Ed
+.Pp
+.Dq ml_props
+may be
+.Dv NULL
+in which case
+.Dq ml_propslen
+must be
+.Dv 0 .
+.It Dv MODCTL_UNLOAD
+Unload a module.
+In this case, the
+.Fa argp
+should be a
+.Dq char *
+containing the name of the module to be unloaded.
+.It Dv MODCTL_STAT
+Return a list of loaded modules.
+In this case, the
+.Fa argp
+should be a
+.Dq struct iovec .
+The kernel will adjust the
+.Dq iov_len
+paramater to reflect the space required.
+The
+.Dq iov_base
+will be a pointer to an array of
+.Dq modstat_t
+truncated to the passed in
+.Dq iov_len .
+.Dq modstat_t
+looks like:
+.Bd -literal
+typedef struct modstat {
+charms_name[MAXMODNAME];
+charms_required[MAXMODNAME * MAXMODDEPS];
+uint64_tms_addr;
+modsrc_tms_source;
+modclass_t ms_class;
+
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jnemeth Date: Tue Oct 20 04:44:34 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi Log Message: new manpage for modctl(2) To generate a diff of this commit: cvs rdiff -u -r1.1330 -r1.1331 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1330 src/distrib/sets/lists/comp/mi:1.1331 --- src/distrib/sets/lists/comp/mi:1.1330 Thu Oct 15 22:59:12 2009 +++ src/distrib/sets/lists/comp/mi Tue Oct 20 04:44:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1330 2009/10/15 22:59:12 jym Exp $ +# $NetBSD: mi,v 1.1331 2009/10/20 04:44:33 jnemeth Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4044,6 +4044,7 @@ ./usr/share/man/cat2/mlock.0 comp-c-catman .cat ./usr/share/man/cat2/mlockall.0 comp-c-catman .cat ./usr/share/man/cat2/mmap.0 comp-c-catman .cat +./usr/share/man/cat2/modctl.0 comp-c-catman .cat ./usr/share/man/cat2/mount.0 comp-c-catman .cat ./usr/share/man/cat2/mprotect.0 comp-c-catman .cat ./usr/share/man/cat2/mremap.0 comp-c-catman .cat @@ -9654,6 +9655,7 @@ ./usr/share/man/html2/mlock.html comp-c-htmlman html ./usr/share/man/html2/mlockall.html comp-c-htmlman html ./usr/share/man/html2/mmap.html comp-c-htmlman html +./usr/share/man/html2/modctl.html comp-c-htmlman html ./usr/share/man/html2/mount.html comp-c-htmlman html ./usr/share/man/html2/mprotect.html comp-c-htmlman html ./usr/share/man/html2/mremap.html comp-c-htmlman html @@ -15043,6 +15045,7 @@ ./usr/share/man/man2/mlock.2 comp-c-man .man ./usr/share/man/man2/mlockall.2 comp-c-man .man ./usr/share/man/man2/mmap.2 comp-c-man .man +./usr/share/man/man2/modctl.2 comp-c-man .man ./usr/share/man/man2/mount.2 comp-c-man .man ./usr/share/man/man2/mprotect.2 comp-c-man .man ./usr/share/man/man2/mremap.2 comp-c-man .man
CVS commit: src/sys/modules/example
Module Name:src
Committed By: jnemeth
Date: Tue Oct 20 05:33:30 UTC 2009
Modified Files:
src/sys/modules/example: example.c
Log Message:
Check to see if we were passed a NULL proplist dictionary.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/example/example.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/modules/example/example.c
diff -u src/sys/modules/example/example.c:1.4 src/sys/modules/example/example.c:1.5
--- src/sys/modules/example/example.c:1.4 Wed Jan 14 00:53:44 2009
+++ src/sys/modules/example/example.c Tue Oct 20 05:33:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: example.c,v 1.4 2009/01/14 00:53:44 haad Exp $ */
+/* $NetBSD: example.c,v 1.5 2009/10/20 05:33:30 jnemeth Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: example.c,v 1.4 2009/01/14 00:53:44 haad Exp $);
+__KERNEL_RCSID(0, $NetBSD: example.c,v 1.5 2009/10/20 05:33:30 jnemeth Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -46,7 +46,11 @@
{
prop_string_t str;
- str = prop_dictionary_get(props, msg);
+ if (props != NULL) {
+ str = prop_dictionary_get(props, msg);
+ } else {
+ str = NULL;
+ }
if (str == NULL)
printf(The 'msg' property was not given.\n);
else if (prop_object_type(str) != PROP_TYPE_STRING)
