CVS commit: src/external/gpl3/gcc/usr.bin/backend

2011-11-10 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 09:28:25 UTC 2011

Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile

Log Message:
add a crude dependency on tm_p.h.  build.sh -j128 fails for me without this.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/usr.bin/backend/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/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.13 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.14
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.13	Mon Nov  7 23:21:32 2011
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Thu Nov 10 09:28:25 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2011/11/07 23:21:32 njoly Exp $
+#	$NetBSD: Makefile,v 1.14 2011/11/10 09:28:25 yamt Exp $
 
 LIBISPRIVATE=	yes
 
@@ -163,6 +163,8 @@ tm_p.h: Makefile tm-preds.h
 	HEADERS=$(G_tm_p_include_list) DEFINES= \
 	${HOST_SH} ${GNUHOSTDIST}/gcc/mkconfig.sh ${.TARGET}
 
+${G_OBJS} ${G_OBJS:.o=.d}:	tm_p.h		# XXX crude
+
 CLEANFILES+=	options.h options.c optionlist
 optionlist: ${G_ALL_OPT_FILES} ${GCCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
 	${TOOL_AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES}  ${.TARGET}



CVS commit: src/external/bsd/file/dist/doc

2011-11-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Nov 10 13:41:01 UTC 2011

Modified Files:
src/external/bsd/file/dist/doc: libmagic.3

Log Message:
PR/45595: bch: fix missing magic prefix


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/doc/libmagic.3

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/file/dist/doc/libmagic.3
diff -u src/external/bsd/file/dist/doc/libmagic.3:1.8 src/external/bsd/file/dist/doc/libmagic.3:1.9
--- src/external/bsd/file/dist/doc/libmagic.3:1.8	Mon Oct  3 11:43:55 2011
+++ src/external/bsd/file/dist/doc/libmagic.3	Thu Nov 10 08:41:00 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: libmagic.3,v 1.8 2011/10/03 15:43:55 njoly Exp $
+.\	$NetBSD: libmagic.3,v 1.9 2011/11/10 13:41:00 christos Exp $
 .\
 .\ $File: libmagic.man,v 1.24 2011/05/13 22:11:44 christos Exp $
 .\
@@ -128,7 +128,7 @@ Don't get extra information on MS Compos
 Don't look inside compressed files.
 .It Dv MAGIC_NO_CHECK_ELF
 Don't print ELF details.
-.It Dv NO_CHECK_ENCODING
+.It Dv MAGIC_NO_CHECK_ENCODING
 Don't check text encodings.
 .It Dv MAGIC_NO_CHECK_SOFT
 Don't consult magic files.



CVS commit: src/lib/libpthread

2011-11-10 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 14:01:11 UTC 2011

Modified Files:
src/lib/libpthread: Makefile
Added Files:
src/lib/libpthread: pthread_curcpu_np.3

Log Message:
document pthread_curcpu_np


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/lib/libpthread/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libpthread/pthread_curcpu_np.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/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.72 src/lib/libpthread/Makefile:1.73
--- src/lib/libpthread/Makefile:1.72	Tue Aug 16 10:36:30 2011
+++ src/lib/libpthread/Makefile	Thu Nov 10 14:01:11 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.72 2011/08/16 10:36:30 christos Exp $
+#	$NetBSD: Makefile,v 1.73 2011/11/10 14:01:11 yamt Exp $
 #
 
 WARNS=	4
@@ -105,6 +105,7 @@ MAN+=	affinity.3 pthread.3 \
 	pthread_cancel.3 pthread_cleanup_push.3 \
 	pthread_cond.3 pthread_condattr.3 \
 	pthread_create.3 pthread_detach.3 pthread_equal.3 \
+	pthread_curcpu_np.3 \
 	pthread_exit.3 \
 	pthread_getname_np.3 \
 	pthread_getspecific.3 pthread_join.3 \

Added files:

Index: src/lib/libpthread/pthread_curcpu_np.3
diff -u /dev/null src/lib/libpthread/pthread_curcpu_np.3:1.1
--- /dev/null	Thu Nov 10 14:01:11 2011
+++ src/lib/libpthread/pthread_curcpu_np.3	Thu Nov 10 14:01:11 2011
@@ -0,0 +1,66 @@
+.\	$NetBSD: pthread_curcpu_np.3,v 1.1 2011/11/10 14:01:11 yamt Exp $
+.\
+.\ Copyright (c)2011 YAMAMOTO Takashi,
+.\ 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 AUTHOR 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 AUTHOR 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 November 10, 2011
+.Dt PTHREAD_CURCPU_NP 3
+.Os
+.\ 
+.Sh NAME
+.Nm pthread_curcpu_np
+.Nd get current CPU identifier
+.\ 
+.Sh SYNOPSIS
+.In pthread.h
+.\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+.Ft unsigned int
+.Fn pthread_curcpu_np \
+void
+.\ 
+.Sh DESCRIPTION
+The
+.Fn pthread_curcpu_np
+function provides a way for a thread to know which CPU it's currently running
+on.
+.Pp
+Note that, unless the thread is bound to a specific CPU, the result might be
+already stale when the function returns.
+However, it still can be useful as a hint to achieve better CPU locality.
+.\ 
+.Sh RETURN VALUES
+The
+.Fn pthread_curcpu_np
+function returns the integer identifier of the CPU which is currently
+running the calling thread.
+.\ 
+.Sh COMPATIBILITY
+The
+.Fn pthread_curcpu_np
+function is a non-standard extention.
+.\ 
+.Sh SEE ALSO
+.Xr affinity 3 ,
+.Xr pthread 3



CVS commit: src/distrib/sets/lists/comp

2011-11-10 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 14:03:04 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
document pthread_curcpu_np


To generate a diff of this commit:
cvs rdiff -u -r1.1705 -r1.1706 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.1705 src/distrib/sets/lists/comp/mi:1.1706
--- src/distrib/sets/lists/comp/mi:1.1705	Tue Nov  8 10:49:41 2011
+++ src/distrib/sets/lists/comp/mi	Thu Nov 10 14:03:02 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1705 2011/11/08 10:49:41 njoly Exp $
+#	$NetBSD: mi,v 1.1706 2011/11/10 14:03:02 yamt Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -8395,6 +8395,7 @@
 ./usr/share/man/cat3/pthread_condattr_destroy.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_condattr_init.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_create.0		comp-c-catman		.cat
+./usr/share/man/cat3/pthread_curcpu_np.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_detach.0		comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_equal.0		comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_exit.0		comp-c-catman		.cat
@@ -14580,6 +14581,7 @@
 ./usr/share/man/html3/pthread_condattr_destroy.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_condattr_init.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_create.html	comp-c-htmlman		html
+./usr/share/man/html3/pthread_curcpu_np.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_detach.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_equal.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_exit.html		comp-c-htmlman		html
@@ -20761,6 +20763,7 @@
 ./usr/share/man/man3/pthread_condattr_destroy.3	comp-c-man		.man
 ./usr/share/man/man3/pthread_condattr_init.3	comp-c-man		.man
 ./usr/share/man/man3/pthread_create.3		comp-c-man		.man
+./usr/share/man/man3/pthread_curcpu_np.3	comp-c-man		.man
 ./usr/share/man/man3/pthread_detach.3		comp-c-man		.man
 ./usr/share/man/man3/pthread_equal.3		comp-c-man		.man
 ./usr/share/man/man3/pthread_exit.3		comp-c-man		.man



CVS commit: [yamt-pagecache] src/sys/kern

2011-11-10 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 14:32:19 UTC 2011

Modified Files:
src/sys/kern [yamt-pagecache]: vfs_vnode.c

Log Message:
remove uobj-memq


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/kern/vfs_vnode.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_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.14 src/sys/kern/vfs_vnode.c:1.14.2.1
--- src/sys/kern/vfs_vnode.c:1.14	Fri Oct  7 09:35:06 2011
+++ src/sys/kern/vfs_vnode.c	Thu Nov 10 14:32:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnode.c,v 1.14 2011/10/07 09:35:06 hannken Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.14.2.1 2011/11/10 14:32:19 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -120,7 +120,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.14 2011/10/07 09:35:06 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.14.2.1 2011/11/10 14:32:19 yamt Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -329,7 +329,7 @@ try_nextlist:
 
 	KASSERT(vp-v_data == NULL);
 	KASSERT(vp-v_uobj.uo_npages == 0);
-	KASSERT(TAILQ_EMPTY(vp-v_uobj.memq));
+	KASSERT(radix_tree_empty_tree_p(vp-v_uobj.uo_pages));
 	KASSERT(vp-v_numoutput == 0);
 	KASSERT((vp-v_iflag  VI_ONWORKLST) == 0);
 
@@ -386,7 +386,7 @@ getnewvnode(enum vtagtype tag, struct mo
 	uobj = vp-v_uobj;
 	KASSERT(uobj-pgops == uvm_vnodeops);
 	KASSERT(uobj-uo_npages == 0);
-	KASSERT(TAILQ_FIRST(uobj-memq) == NULL);
+	KASSERT(radix_tree_empty_tree_p(vp-v_uobj.uo_pages));
 	vp-v_size = vp-v_writesize = VSIZENOTSET;
 
 	/* Share the vnode_t::v_interlock, if requested. */



CVS commit: [yamt-pagecache] src/sys/arch/x86/x86

2011-11-10 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 14:32:36 UTC 2011

Modified Files:
src/sys/arch/x86/x86 [yamt-pagecache]: pmap.c

Log Message:
remove uobj-memq


To generate a diff of this commit:
cvs rdiff -u -r1.137.2.2 -r1.137.2.3 src/sys/arch/x86/x86/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.137.2.2 src/sys/arch/x86/x86/pmap.c:1.137.2.3
--- src/sys/arch/x86/x86/pmap.c:1.137.2.2	Thu Nov 10 14:31:44 2011
+++ src/sys/arch/x86/x86/pmap.c	Thu Nov 10 14:32:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.137.2.2 2011/11/10 14:31:44 yamt Exp $	*/
+/*	$NetBSD: pmap.c,v 1.137.2.3 2011/11/10 14:32:36 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.137.2.2 2011/11/10 14:31:44 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.137.2.3 2011/11/10 14:32:36 yamt Exp $);
 
 #include opt_user_ldt.h
 #include opt_lockdebug.h
@@ -1805,7 +1805,7 @@ pmap_freepage(struct pmap *pmap, struct 
 	if (lidx != 0)
 		mutex_enter(obj-vmobjlock);
 	if (pmap-pm_ptphint[lidx] == ptp)
-		pmap-pm_ptphint[lidx] = TAILQ_FIRST(obj-memq);
+		pmap-pm_ptphint[lidx] = NULL;
 	ptp-wire_count = 0;
 	uvm_pagerealloc(ptp, NULL, 0);
 	l = curlwp;
@@ -2366,7 +2366,6 @@ pmap_destroy(struct pmap *pmap)
 
 	for (i = 0; i  PTP_LEVELS - 1; i++) {
 		KASSERT(pmap-pm_obj[i].uo_npages == 0);
-		KASSERT(TAILQ_EMPTY(pmap-pm_obj[i].memq));
 	}
 
 	/*



CVS commit: [yamt-pagecache] src/sys/rump/librump/rumpkern

2011-11-10 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 14:33:18 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern [yamt-pagecache]: vm.c

Log Message:
remove uobj-memq


To generate a diff of this commit:
cvs rdiff -u -r1.120.2.1 -r1.120.2.2 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.120.2.1 src/sys/rump/librump/rumpkern/vm.c:1.120.2.2
--- src/sys/rump/librump/rumpkern/vm.c:1.120.2.1	Wed Nov  2 21:53:59 2011
+++ src/sys/rump/librump/rumpkern/vm.c	Thu Nov 10 14:33:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.120.2.1 2011/11/02 21:53:59 yamt Exp $	*/
+/*	$NetBSD: vm.c,v 1.120.2.2 2011/11/10 14:33:18 yamt Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.1 2011/11/02 21:53:59 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.2 2011/11/10 14:33:18 yamt Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -162,7 +162,6 @@ uvm_pagealloc_strat(struct uvm_object *u
 		uvm_pagezero(pg);
 	}
 
-	TAILQ_INSERT_TAIL(uobj-memq, pg, listq.queue);
 	error = radix_tree_insert_node(uobj-uo_pages,
 	pg-offset  PAGE_SHIFT, pg);
 	KASSERT(error == 0);
@@ -201,8 +200,6 @@ uvm_pagefree(struct vm_page *pg)
 	if (pg-flags  PG_WANTED)
 		wakeup(pg);
 
-	TAILQ_REMOVE(uobj-memq, pg, listq.queue);
-
 	uobj-uo_npages--;
 	opg = radix_tree_remove_node(uobj-uo_pages, pg-offset  PAGE_SHIFT);
 	KASSERT(pg == opg);



CVS commit: [yamt-pagecache] src/sys/miscfs/genfs

2011-11-10 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 14:37:33 UTC 2011

Modified Files:
src/sys/miscfs/genfs [yamt-pagecache]: genfs_io.c

Log Message:
- remove uobj-memq
- fix UVM_PAGE_TRKOWN
- comments


To generate a diff of this commit:
cvs rdiff -u -r1.53.2.1 -r1.53.2.2 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.53.2.1 src/sys/miscfs/genfs/genfs_io.c:1.53.2.2
--- src/sys/miscfs/genfs/genfs_io.c:1.53.2.1	Wed Nov  2 21:53:59 2011
+++ src/sys/miscfs/genfs/genfs_io.c	Thu Nov 10 14:37:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfs_io.c,v 1.53.2.1 2011/11/02 21:53:59 yamt Exp $	*/
+/*	$NetBSD: genfs_io.c,v 1.53.2.2 2011/11/10 14:37:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.53.2.1 2011/11/02 21:53:59 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.53.2.2 2011/11/10 14:37:33 yamt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -869,10 +869,10 @@ genfs_do_putpages(struct vnode *vp, off_
 	struct genfs_node * const gp = VTOG(vp);
 	int flags;
 	int dirtygen;
-	bool modified;
+	bool modified;		/* if we write out any pages */
 	bool need_wapbl;
 	bool has_trans;
-	bool cleanall;
+	bool cleanall;		/* try to pull off from the syncer's list */
 	bool onworklst;
 	const bool dirtyonly = (origflags  (PGO_DEACTIVATE|PGO_FREE)) == 0;
 
@@ -894,7 +894,9 @@ retry:
 	flags = origflags;
 	KASSERT((vp-v_iflag  VI_ONWORKLST) != 0 ||
 	(vp-v_iflag  VI_WRMAPDIRTY) == 0);
-	if (uobj-uo_npages == 0) {
+	if (uobj-uo_npages == 0 || (dirtyonly 
+	radix_tree_empty_tagged_tree_p(uobj-uo_pages,
+	UVM_PAGE_DIRTY_TAG))) {
 		if (vp-v_iflag  VI_ONWORKLST) {
 			vp-v_iflag = ~VI_WRMAPDIRTY;
 			if (LIST_FIRST(vp-v_dirtyblkhd) == NULL)
@@ -947,7 +949,7 @@ retry:
 
 	if ((vp-v_iflag  VI_ONWORKLST) == 0) {
 #if !defined(DEBUG)
-		if ((flags  (PGO_FREE|PGO_DEACTIVATE)) == 0) {
+		if (dirtyonly) {
 			goto skip_scan;
 		}
 #endif /* !defined(DEBUG) */
@@ -1177,6 +1179,7 @@ retry:
 	break;
 }
 nextpg-flags |= PG_BUSY;
+UVM_PAGE_OWN(nextpg, genfs_putpages2);
 pgs[npages] = nextpg;
 uvm_page_array_advance(ar);
 			}
@@ -1254,6 +1257,16 @@ retry:
 	}
 	uvm_page_array_fini(ar);
 
+	/*
+	 * update ctime/mtime if the modification we started writing out might
+	 * be from mmap'ed write.
+	 *
+	 * this is necessary when an application keeps a file mmaped and
+	 * repeatedly modifies it via the window.  note that, because we
+	 * don't always write-protect pages when cleaning, such modifications
+	 * might not involve any page faults.
+	 */
+
 	if (modified  (vp-v_iflag  VI_WRMAPDIRTY) != 0 
 	(vp-v_type != VBLK ||
 	(vp-v_mount-mnt_flag  MNT_NODEVMTIME) == 0)) {
@@ -1268,20 +1281,6 @@ retry:
 
 	if (cleanall  wasclean  gp-g_dirtygen == dirtygen 
 	(vp-v_iflag  VI_ONWORKLST) != 0) {
-#if defined(DEBUG)
-		TAILQ_FOREACH(pg, uobj-memq, listq.queue) {
-			if ((pg-flags  (PG_FAKE | PG_MARKER)) != 0) {
-continue;
-			}
-			if (uvm_pagegetdirty(pg) == UVM_PAGE_STATUS_DIRTY) {
-printf(%s: %p: dirty\n, __func__, pg);
-			}
-			if (uvm_pagegetdirty(pg) == UVM_PAGE_STATUS_UNKNOWN) {
-printf(%s: %p: unknown\n, __func__, pg);
-			}
-		}
-#endif /* defined(DEBUG) */
-
 		KASSERT(radix_tree_empty_tagged_tree_p(uobj-uo_pages,
 		UVM_PAGE_DIRTY_TAG));
 		vp-v_iflag = ~VI_WRMAPDIRTY;



CVS commit: src/lib/libperfuse

2011-11-10 Thread Emmanuel Dreyfus
Module Name:src
Committed By:   manu
Date:   Thu Nov 10 16:21:10 UTC 2011

Modified Files:
src/lib/libperfuse: ops.c

Log Message:
Return EISDIR for read/write to directories. NetBSD directory read should
instead return a getent(2) output, but is that really used?


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libperfuse/ops.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/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.43 src/lib/libperfuse/ops.c:1.44
--- src/lib/libperfuse/ops.c:1.43	Sun Oct 30 05:11:37 2011
+++ src/lib/libperfuse/ops.c	Thu Nov 10 16:21:09 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.43 2011/10/30 05:11:37 manu Exp $ */
+/*  $NetBSD: ops.c,v 1.44 2011/11/10 16:21:09 manu Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -2954,6 +2954,13 @@ perfuse_node_read(pu, opc, buf, offset, 
 	vap = puffs_pn_getvap((struct puffs_node *)opc);
 	pm = NULL;
 
+	/*
+	 * NetBSD turns that into a getdents(2) output
+	 * We just do a EISDIR as this feature is of little use.
+	 */
+	if (vap-va_type == VDIR)
+		return EISDIR;
+
 	if ((u_quad_t)offset + *resid  vap-va_size)
 		DWARNX(%s %p read %lld@%zu beyond EOF % PRIu64 \n,
 		   __func__, (void *)opc, (long long)offset,
@@ -3048,7 +3055,7 @@ perfuse_node_write(pu, opc, buf, offset,
 	pm = NULL;
 
 	if (vap-va_type == VDIR) 
-		return EBADF;
+		return EISDIR;
 
 	/*
 	 * We need to queue write requests in order to avoid



CVS commit: src/lib/libpthread

2011-11-10 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Nov 10 16:44:47 UTC 2011

Modified Files:
src/lib/libpthread: pthread_curcpu_np.3

Log Message:
Fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libpthread/pthread_curcpu_np.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/libpthread/pthread_curcpu_np.3
diff -u src/lib/libpthread/pthread_curcpu_np.3:1.1 src/lib/libpthread/pthread_curcpu_np.3:1.2
--- src/lib/libpthread/pthread_curcpu_np.3:1.1	Thu Nov 10 14:01:11 2011
+++ src/lib/libpthread/pthread_curcpu_np.3	Thu Nov 10 16:44:47 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: pthread_curcpu_np.3,v 1.1 2011/11/10 14:01:11 yamt Exp $
+.\	$NetBSD: pthread_curcpu_np.3,v 1.2 2011/11/10 16:44:47 wiz Exp $
 .\
 .\ Copyright (c)2011 YAMAMOTO Takashi,
 .\ All rights reserved.
@@ -59,7 +59,7 @@ running the calling thread.
 .Sh COMPATIBILITY
 The
 .Fn pthread_curcpu_np
-function is a non-standard extention.
+function is a non-standard extension.
 .\ 
 .Sh SEE ALSO
 .Xr affinity 3 ,



CVS commit: src/sys/netinet6

2011-11-10 Thread Sean Boudreau
Module Name:src
Committed By:   seanb
Date:   Thu Nov 10 17:10:00 UTC 2011

Modified Files:
src/sys/netinet6: nd6.c

Log Message:
- Remove unused variable from nd6_timer().


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/netinet6/nd6.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/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.136 src/sys/netinet6/nd6.c:1.137
--- src/sys/netinet6/nd6.c:1.136	Thu Jul 15 19:15:30 2010
+++ src/sys/netinet6/nd6.c	Thu Nov 10 17:10:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.c,v 1.136 2010/07/15 19:15:30 dyoung Exp $	*/
+/*	$NetBSD: nd6.c,v 1.137 2011/11/10 17:10:00 seanb Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.136 2010/07/15 19:15:30 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.137 2011/11/10 17:10:00 seanb Exp $);
 
 #include opt_ipsec.h
 
@@ -524,7 +524,6 @@ nd6_timer(void *ignored_arg)
 	struct nd_defrouter *next_dr, *dr;
 	struct nd_prefix *next_pr, *pr;
 	struct in6_ifaddr *ia6, *nia6;
-	struct in6_addrlifetime *lt6;
 
 	callout_reset(nd6_timer_ch, nd6_prune * hz,
 	nd6_timer, NULL);
@@ -551,7 +550,6 @@ nd6_timer(void *ignored_arg)
 	for (ia6 = in6_ifaddr; ia6; ia6 = nia6) {
 		nia6 = ia6-ia_next;
 		/* check address lifetime */
-		lt6 = ia6-ia6_lifetime;
 		if (IFA6_IS_INVALID(ia6)) {
 			int regen = 0;
 



CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax

2011-11-10 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Thu Nov 10 17:16:30 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/vax: builtins.md vax.md

Log Message:
include builtins.md in vax.md so that ffs is defined.
update for conditional branch changes in gcc.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md \
src/external/gpl3/gcc/dist/gcc/config/vax/vax.md

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.2
--- src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.1.1.1	Tue Jun 21 01:22:25 2011
+++ src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md	Thu Nov 10 17:16:30 2011
@@ -24,6 +24,12 @@
   ]
 )
 
+(define_expand condjump
+  [(set (pc)
+	(if_then_else (match_operand 0)
+		  (label_ref (match_operand 1))
+		  (pc)))])
+
 (define_expand ffssi2
   [(set (match_operand:SI 0 nonimmediate_operand )
 	(ffs:SI (match_operand:SI 1 general_operand )))]
@@ -32,7 +38,7 @@
 {
   rtx label = gen_label_rtx ();
   emit_insn (gen_ffssi2_internal (operands[0], operands[1]));
-  emit_jump_insn (gen_bne (label));
+  emit_jump_insn (gen_condjump (gen_rtx_NE(VOIDmode, cc0_rtx, const0_rtx), label));
   emit_insn (gen_negsi2 (operands[0], const1_rtx));
   emit_label (label);
   emit_insn (gen_addsi3 (operands[0], operands[0], const1_rtx));
@@ -189,4 +195,3 @@
 	  (const_int 0))])]
   
   jbcci %1,%0,%l2)
-
Index: src/external/gpl3/gcc/dist/gcc/config/vax/vax.md
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.2
--- src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.1.1.1	Tue Jun 21 01:22:25 2011
+++ src/external/gpl3/gcc/dist/gcc/config/vax/vax.md	Thu Nov 10 17:16:30 2011
@@ -1634,3 +1634,5 @@
   emit_barrier ();
   DONE;
 })
+
+(include builtins.md)



CVS commit: src/distrib/sets/lists/comp

2011-11-10 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Thu Nov 10 17:18:22 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: md.vax

Log Message:
add gcc-4.5/tgmath.h


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/comp/md.vax

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/md.vax
diff -u src/distrib/sets/lists/comp/md.vax:1.36 src/distrib/sets/lists/comp/md.vax:1.37
--- src/distrib/sets/lists/comp/md.vax:1.36	Sun Jul 17 20:54:32 2011
+++ src/distrib/sets/lists/comp/md.vax	Thu Nov 10 17:18:22 2011
@@ -1,5 +1,6 @@
-# $NetBSD: md.vax,v 1.36 2011/07/17 20:54:32 joerg Exp $
+# $NetBSD: md.vax,v 1.37 2011/11/10 17:18:22 chs Exp $
 ./usr/include/ieeefp.hcomp-obsolete		obsolete
+./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/vaxcomp-c-include
 ./usr/include/vax/_G_config.h			comp-obsolete		obsolete
 ./usr/include/vax/ansi.h			comp-c-include



CVS commit: src/sys/dev/pci

2011-11-10 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Thu Nov 10 20:12:49 UTC 2011

Modified Files:
src/sys/dev/pci: if_tlp_pci.c

Log Message:
When applying the board-specific bits for the SMC 9332,
the mediasw has already been set to non-NULL, don't require it to be NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/pci/if_tlp_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_tlp_pci.c
diff -u src/sys/dev/pci/if_tlp_pci.c:1.118 src/sys/dev/pci/if_tlp_pci.c:1.119
--- src/sys/dev/pci/if_tlp_pci.c:1.118	Tue Jul 26 20:51:24 2011
+++ src/sys/dev/pci/if_tlp_pci.c	Thu Nov 10 20:12:48 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tlp_pci.c,v 1.118 2011/07/26 20:51:24 dyoung Exp $	*/
+/*	$NetBSD: if_tlp_pci.c,v 1.119 2011/11/10 20:12:48 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tlp_pci.c,v 1.118 2011/07/26 20:51:24 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tlp_pci.c,v 1.119 2011/11/10 20:12:48 jakllsch Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1380,9 +1380,6 @@ tlp_pci_smc_21140_quirks(struct tulip_pc
 {
 	struct tulip_softc *sc = psc-sc_tulip;
 
-	if (sc-sc_mediasw != NULL) {
-		return;
-	}
 	strcpy(psc-sc_tulip.sc_name, SMC 9332DST);
 	sc-sc_mediasw = tlp_smc9332dst_mediasw;
 }



CVS commit: src/sys/arch/amd64/conf

2011-11-10 Thread Jeff Rizzo
Module Name:src
Committed By:   riz
Date:   Thu Nov 10 22:16:56 UTC 2011

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOMU

Log Message:
Add pseudo-device drvctl. (Already exists in i386 domU config)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/conf/XEN3_DOMU

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/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.31 src/sys/arch/amd64/conf/XEN3_DOMU:1.32
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.31	Tue Oct 25 15:01:46 2011
+++ src/sys/arch/amd64/conf/XEN3_DOMU	Thu Nov 10 22:16:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.31 2011/10/25 15:01:46 jakllsch Exp $
+# $NetBSD: XEN3_DOMU,v 1.32 2011/11/10 22:16:56 riz Exp $
 
 include 	arch/amd64/conf/std.xen
 
@@ -234,3 +234,7 @@ pseudo-device	vcoda		4	# coda minicache 
 
 # a pseudo device needed for SMBFS
 pseudo-device	nsmb			# experimental - SMB requester
+
+# userland interface to drivers, including autoconf and properties retrieval
+pseudo-device	drvctl
+



CVS commit: src/sys/arch/vax/vax

2011-11-10 Thread Nicolas Joly
Module Name:src
Committed By:   njoly
Date:   Thu Nov 10 22:33:12 UTC 2011

Modified Files:
src/sys/arch/vax/vax: autoconf.c

Log Message:
Remove extra newlines.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/vax/vax/autoconf.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/vax/vax/autoconf.c
diff -u src/sys/arch/vax/vax/autoconf.c:1.92 src/sys/arch/vax/vax/autoconf.c:1.93
--- src/sys/arch/vax/vax/autoconf.c:1.92	Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/autoconf.c	Thu Nov 10 22:33:12 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.92 2010/12/14 23:44:49 matt Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.93 2011/11/10 22:33:12 njoly Exp $	*/
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.92 2010/12/14 23:44:49 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.93 2011/11/10 22:33:12 njoly Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_cputype.h
@@ -117,8 +117,8 @@ mainbus_print(void *aux, const char *nam
 {
 	struct mainbus_attach_args * const ma = aux;
 	if (name) {
-		aprint_naive(%s at %s\n, ma-ma_type, name);
-		aprint_normal(%s at %s\n, ma-ma_type, name);
+		aprint_naive(%s at %s, ma-ma_type, name);
+		aprint_normal(%s at %s, ma-ma_type, name);
 }
 	return UNCONF;
 }



CVS commit: [yamt-pagecache] src/sys/sys

2011-11-10 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 23:51:17 UTC 2011

Modified Files:
src/sys/sys [yamt-pagecache]: Makefile

Log Message:
install radixtree.h


To generate a diff of this commit:
cvs rdiff -u -r1.139.2.1 -r1.139.2.2 src/sys/sys/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/Makefile
diff -u src/sys/sys/Makefile:1.139.2.1 src/sys/sys/Makefile:1.139.2.2
--- src/sys/sys/Makefile:1.139.2.1	Thu Nov 10 14:31:51 2011
+++ src/sys/sys/Makefile	Thu Nov 10 23:51:17 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.139.2.1 2011/11/10 14:31:51 yamt Exp $
+#	$NetBSD: Makefile,v 1.139.2.2 2011/11/10 23:51:17 yamt Exp $
 
 .include bsd.sys.mk
 
@@ -27,8 +27,8 @@ INCS=	acct.h agpio.h aio.h ansi.h aout_m
 	param.h pcu.h pipe.h pmc.h poll.h pool.h power.h proc.h \
 	protosw.h pset.h ptrace.h ptree.h \
 	queue.h quota.h \
-	ras.h rbtree.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \
-	rnd.h rwlock.h sa.h satypes.h \
+	radixtree.h ras.h rbtree.h reboot.h radioio.h resource.h resourcevar.h \
+	rmd160.h rnd.h rwlock.h sa.h satypes.h \
 	scanio.h sched.h scsiio.h sdt.h select.h selinfo.h sem.h sha1.h \
 	sha2.h shm.h siginfo.h signal.h signalvar.h sigtypes.h simplelock.h \
 	sleepq.h socket.h \



CVS commit: src/external/public-domain/sqlite

2011-11-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Nov 11 01:34:18 UTC 2011

Modified Files:
src/external/public-domain/sqlite: Makefile.inc

Log Message:
enable unlock notify


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/sqlite/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/public-domain/sqlite/Makefile.inc
diff -u src/external/public-domain/sqlite/Makefile.inc:1.2 src/external/public-domain/sqlite/Makefile.inc:1.3
--- src/external/public-domain/sqlite/Makefile.inc:1.2	Sun Oct 16 13:24:50 2011
+++ src/external/public-domain/sqlite/Makefile.inc	Thu Nov 10 20:34:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/10/16 17:24:50 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2011/11/11 01:34:18 christos Exp $
 
 WARNS=		2
 
@@ -9,6 +9,7 @@ SRCDIR:=	${.PARSEDIR}/dist
 CPPFLAGS+=	-DHAVE_READLINE=1 -DHAVE_LOCALTIME_R \
 		-DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_FTS4 \
 		-DSQLITE_ENABLE_FTS3_PARENTHESIS \
+		-DSQLITE_ENABLE_UNLOCK_NOTIFY \
 		-DSQLITE_ENABLE_LOAD_EXTENSION
 
 CWARNFLAGS+=	-Wno-shadow -Wno-unused



CVS commit: src/tests/lib/libc/gen

2011-11-10 Thread Jukka Ruohonen
Module Name:src
Committed By:   jruoho
Date:   Fri Nov 11 05:03:38 UTC 2011

Modified Files:
src/tests/lib/libc/gen: t_time.c

Log Message:
Fix wrong format string.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/gen/t_time.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/lib/libc/gen/t_time.c
diff -u src/tests/lib/libc/gen/t_time.c:1.1 src/tests/lib/libc/gen/t_time.c:1.2
--- src/tests/lib/libc/gen/t_time.c:1.1	Sat Nov  5 18:07:15 2011
+++ src/tests/lib/libc/gen/t_time.c	Fri Nov 11 05:03:38 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_time.c,v 1.1 2011/11/05 18:07:15 jruoho Exp $ */
+/*	$NetBSD: t_time.c,v 1.2 2011/11/11 05:03:38 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: t_time.c,v 1.1 2011/11/05 18:07:15 jruoho Exp $);
+__RCSID($NetBSD: t_time.c,v 1.2 2011/11/11 05:03:38 jruoho Exp $);
 
 #include atf-c.h
 #include errno.h
@@ -96,7 +96,7 @@ ATF_TC_BODY(time_timeofday, tc)
 	t = time(NULL);
 	ATF_REQUIRE(gettimeofday(tv, NULL) == 0);
 
-	(void)fprintf(stderr, %PRIu64 vs. %PRIu64\n,
+	(void)fprintf(stderr, %PRId64 vs. %PRId64\n,
 	(int64_t)t, (int64_t)tv.tv_sec);
 
 	if (t != tv.tv_sec)



CVS commit: src/tests/lib/libc/sys

2011-11-10 Thread Jukka Ruohonen
Module Name:src
Committed By:   jruoho
Date:   Fri Nov 11 05:06:01 UTC 2011

Modified Files:
src/tests/lib/libc/sys: t_msgctl.c t_msgrcv.c

Log Message:
Fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/sys/t_msgctl.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_msgrcv.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/lib/libc/sys/t_msgctl.c
diff -u src/tests/lib/libc/sys/t_msgctl.c:1.2 src/tests/lib/libc/sys/t_msgctl.c:1.3
--- src/tests/lib/libc/sys/t_msgctl.c:1.2	Sat Nov  5 08:47:54 2011
+++ src/tests/lib/libc/sys/t_msgctl.c	Fri Nov 11 05:06:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_msgctl.c,v 1.2 2011/11/05 08:47:54 jruoho Exp $ */
+/* $NetBSD: t_msgctl.c,v 1.3 2011/11/11 05:06:01 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: t_msgctl.c,v 1.2 2011/11/05 08:47:54 jruoho Exp $);
+__RCSID($NetBSD: t_msgctl.c,v 1.3 2011/11/11 05:06:01 jruoho Exp $);
 
 #include sys/msg.h
 #include sys/stat.h
@@ -105,7 +105,7 @@ ATF_TC_CLEANUP(msgctl_err, tc)
 ATF_TC_WITH_CLEANUP(msgctl_perm);
 ATF_TC_HEAD(msgctl_perm, tc)
 {
-	atf_tc_set_md_var(tc, descr, Test permissiosn with msgctl(2));
+	atf_tc_set_md_var(tc, descr, Test permissions with msgctl(2));
 	atf_tc_set_md_var(tc, require.user, root);
 }
 

Index: src/tests/lib/libc/sys/t_msgrcv.c
diff -u src/tests/lib/libc/sys/t_msgrcv.c:1.1 src/tests/lib/libc/sys/t_msgrcv.c:1.2
--- src/tests/lib/libc/sys/t_msgrcv.c:1.1	Sat Nov  5 07:45:41 2011
+++ src/tests/lib/libc/sys/t_msgrcv.c	Fri Nov 11 05:06:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_msgrcv.c,v 1.1 2011/11/05 07:45:41 jruoho Exp $ */
+/* $NetBSD: t_msgrcv.c,v 1.2 2011/11/11 05:06:01 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: t_msgrcv.c,v 1.1 2011/11/05 07:45:41 jruoho Exp $);
+__RCSID($NetBSD: t_msgrcv.c,v 1.2 2011/11/11 05:06:01 jruoho Exp $);
 
 #include sys/msg.h
 #include sys/stat.h
@@ -127,7 +127,7 @@ ATF_TC_BODY(msgrcv_block, tc)
 	/*
 	 * Below msgsnd(2) should unblock the child,
 	 * and hence kill(2) should fail with ESRCH.
-	  */
+	 */
 	(void)sleep(1);
 	(void)msgsnd(id, msg, sizeof(struct msg), IPC_NOWAIT);
 	(void)sleep(1);