CVS commit: src/sys/sys

2013-10-27 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 27 08:35:41 UTC 2013

Modified Files:
src/sys/sys: Makefile

Log Message:
install lua.h


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 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.143 src/sys/sys/Makefile:1.144
--- src/sys/sys/Makefile:1.143	Sun Feb 19 21:06:57 2012
+++ src/sys/sys/Makefile	Sun Oct 27 08:35:40 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.143 2012/02/19 21:06:57 rmind Exp $
+#	$NetBSD: Makefile,v 1.144 2013/10/27 08:35:40 mbalmer Exp $
 
 .include bsd.sys.mk
 
@@ -20,7 +20,7 @@ INCS=	acct.h agpio.h aio.h ansi.h aout_m
 	ieee754.h inttypes.h ioccom.h ioctl.h ioctl_compat.h iostat.h ipc.h \
 	joystick.h \
 	kcore.h kcpuset.h kgdb.h kmem.h ksem.h ksyms.h ktrace.h \
-	localedef.h lock.h lockf.h lwp.h lwpctl.h \
+	localedef.h lock.h lockf.h lua.h lwp.h lwpctl.h \
 	malloc.h mallocvar.h mbuf.h md4.h md5.h midiio.h \
 	mman.h module.h mount.h mqueue.h msg.h msgbuf.h mtio.h mutex.h \
 	namei.h null.h \

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

2013-10-27 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 27 08:37:22 UTC 2013

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

Log Message:
lua.h is not imaginary anymore


To generate a diff of this commit:
cvs rdiff -u -r1.1848 -r1.1849 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.1848 src/distrib/sets/lists/comp/mi:1.1849
--- src/distrib/sets/lists/comp/mi:1.1848	Sun Oct 27 02:39:21 2013
+++ src/distrib/sets/lists/comp/mi	Sun Oct 27 08:37:22 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1848 2013/10/27 02:39:21 htodd Exp $
+#	$NetBSD: mi,v 1.1849 2013/10/27 08:37:22 mbalmer Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2590,6 +2590,7 @@
 ./usr/include/sys/localedef.h			comp-c-include
 ./usr/include/sys/lock.h			comp-c-include
 ./usr/include/sys/lockf.h			comp-c-include
+./usr/include/sys/lua.hcomp-c-include
 ./usr/include/sys/lwp.hcomp-c-include
 ./usr/include/sys/lwpctl.h			comp-c-include
 ./usr/include/sys/malloc.h			comp-c-include

CVS commit: src/doc

2013-10-27 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sun Oct 27 09:22:20 UTC 2013

Modified Files:
src/doc: 3RDPARTY

Log Message:
grep-2.15 out.


To generate a diff of this commit:
cvs rdiff -u -r1.1060 -r1.1061 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1060 src/doc/3RDPARTY:1.1061
--- src/doc/3RDPARTY:1.1060	Fri Oct 18 23:43:35 2013
+++ src/doc/3RDPARTY	Sun Oct 27 09:22:20 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1060 2013/10/18 23:43:35 jmmv Exp $
+#	$NetBSD: 3RDPARTY,v 1.1061 2013/10/27 09:22:20 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -443,7 +443,7 @@ Notes:
 
 Package:	grep
 Version:	2.5.1
-Current Vers:	2.14
+Current Vers:	2.15
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/grep/
 Home Page:	http://www.gnu.org/software/grep/

CVS commit: src/distrib/sets/lists

2013-10-27 Thread Alan Barrett 
Module Name:src
Committed By:   apb
Date:   Sun Oct 27 09:27:23 UTC 2013

Modified Files:
src/distrib/sets/lists/base: ad.arm ad.mips md.amd64 md.sparc64 mi
shl.mi
src/distrib/sets/lists/comp: md.amd64 mi shl.mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/tests: mi

Log Message:
sort


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.213 -r1.214 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.200 -r1.201 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.1044 -r1.1045 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.675 -r1.676 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.201 -r1.202 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.1849 -r1.1850 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.254 -r1.255 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1443 -r1.1444 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.546 -r1.547 src/distrib/sets/lists/tests/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/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.23 src/distrib/sets/lists/base/ad.arm:1.24
--- src/distrib/sets/lists/base/ad.arm:1.23	Sat Oct 19 01:12:46 2013
+++ src/distrib/sets/lists/base/ad.arm	Sun Oct 27 09:27:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.23 2013/10/19 01:12:46 christos Exp $
+# $NetBSD: ad.arm,v 1.24 2013/10/27 09:27:23 apb Exp $
 ./lib/oabi	base-compat-shlib	compat
 ./lib/oabi/npf	base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -191,10 +191,10 @@
 ./usr/lib/oabi/libldap_r.so.4.2			base-compat-shlib	compat,pic,ldap
 ./usr/lib/oabi/liblua.so.1			base-compat-shlib	compat,pic
 ./usr/lib/oabi/liblua.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/oabi/liblutok.so.2			base-compat-shlib	compat,pic,kyua
-./usr/lib/oabi/liblutok.so.2.0			base-compat-shlib	compat,pic,kyua
 ./usr/lib/oabi/liblutok.so.1			base-obsolete		obsolete
 ./usr/lib/oabi/liblutok.so.1.0			base-obsolete		obsolete
+./usr/lib/oabi/liblutok.so.2			base-compat-shlib	compat,pic,kyua
+./usr/lib/oabi/liblutok.so.2.0			base-compat-shlib	compat,pic,kyua
 ./usr/lib/oabi/liblwres.so.7			base-compat-shlib	compat,pic
 ./usr/lib/oabi/liblwres.so.7.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/liblzf.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.18 src/distrib/sets/lists/base/ad.mips:1.19
--- src/distrib/sets/lists/base/ad.mips:1.18	Sat Oct 19 01:12:46 2013
+++ src/distrib/sets/lists/base/ad.mips	Sun Oct 27 09:27:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.18 2013/10/19 01:12:46 christos Exp $
+# $NetBSD: ad.mips,v 1.19 2013/10/27 09:27:23 apb Exp $
 ./lib/64	base-compat-shlib	compat,arch64
 ./lib/64/npf	base-npf-shlib		compat,arch64
 ./lib/64/npf/ext_log.sobase-npf-shlib		compat,pic,arch64
@@ -191,10 +191,10 @@
 ./usr/lib/64/libldap_r.so.4.2			base-compat-shlib	compat,pic,ldap,arch64
 ./usr/lib/64/liblua.so.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/liblua.so.1.0			base-compat-shlib	compat,pic,arch64
-./usr/lib/64/liblutok.so.2			base-compat-shlib	compat,pic,kyua,arch64
-./usr/lib/64/liblutok.so.2.0			base-compat-shlib	compat,pic,kyua,arch64
 ./usr/lib/64/liblutok.so.1			base-obsolete		obsolete
 ./usr/lib/64/liblutok.so.1.0			base-obsolete		obsolete
+./usr/lib/64/liblutok.so.2			base-compat-shlib	compat,pic,kyua,arch64
+./usr/lib/64/liblutok.so.2.0			base-compat-shlib	compat,pic,kyua,arch64
 ./usr/lib/64/liblwres.so.7			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/liblwres.so.7.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/liblzf.so.1			base-compat-shlib	compat,pic,arch64

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.213 src/distrib/sets/lists/base/md.amd64:1.214
--- src/distrib/sets/lists/base/md.amd64:1.213	Sat Oct 19 01:12:46 2013
+++ src/distrib/sets/lists/base/md.amd64	Sun Oct 27 09:27:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.213 2013/10/19 01:12:46 christos Exp $
+# $NetBSD: md.amd64,v 1.214 2013/10/27 09:27:23 apb Exp $
 ./dev/lms0	base-obsolete		obsolete
 ./dev/mms0	base-obsolete		obsolete
 ./lib/i386	base-compat-shlib		compat
@@ -188,10 +188,10 @@
 ./usr/lib/i386/liblua.so.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblua.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblutok.so			base-compat-shlib	compat,pic,kyua
-./usr/lib/i386/liblutok.so.2			base-compat-shlib	compat,pic,kyua
-./usr/lib/i386/liblutok.so.2.0			base-compat-shlib	compat,pic,kyua
 ./usr/lib/i386/liblutok.so.1			base-obsolete		obsolete
 ./usr/lib/i386/liblutok.so.1.0			base-obsolete

CVS commit: src/distrib/sets

2013-10-27 Thread Alan Barrett 
Module Name:src
Committed By:   apb
Date:   Sun Oct 27 09:29:42 UTC 2013

Modified Files:
src/distrib/sets: Makefile

Log Message:
Add make sortlists, for sorting the set lists.  This may be
run manually, before committing changes to the lists files.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/Makefile

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/Makefile
diff -u src/distrib/sets/Makefile:1.88 src/distrib/sets/Makefile:1.89
--- src/distrib/sets/Makefile:1.88	Thu Feb 21 14:08:50 2013
+++ src/distrib/sets/Makefile	Sun Oct 27 09:29:42 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.88 2013/02/21 14:08:50 christos Exp $
+#	$NetBSD: Makefile,v 1.89 2013/10/27 09:29:42 apb Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -307,6 +307,17 @@ makesyspkgsums: .PHONY check_RELEASEDIR
 makedeps: .PHONY
 	${SETSCMD} ./syspkgdeps all ${.CURDIR}/deps
 
+# Sort the lists files
+sortlists: .PHONY
+	find ${.CURDIR}/lists \! \( -name CVS -prune \) -type f -print \
+	| while read f ; do \
+	${_MKSHMSG} sorting $${f#${.CURDIR}/} ; \
+	{ grep '^#' $$f ; \
+	  grep -v '^#' $$f | sort ; \
+	} $$f.tmp \
+	 mv $$f.tmp $$f ; \
+	  done
+
 #
 # MAIN ENTRY POINTS
 #

CVS commit: src/share/man/man3

2013-10-27 Thread Alan Barrett 
Module Name:src
Committed By:   apb
Date:   Sun Oct 27 10:05:15 UTC 2013

Modified Files:
src/share/man/man3: cdefs.3

Log Message:
refer to __USE(3)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man3/cdefs.3

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/man3/cdefs.3
diff -u src/share/man/man3/cdefs.3:1.3 src/share/man/man3/cdefs.3:1.4
--- src/share/man/man3/cdefs.3:1.3	Fri Apr  8 07:55:04 2011
+++ src/share/man/man3/cdefs.3	Sun Oct 27 10:05:15 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: cdefs.3,v 1.3 2011/04/08 07:55:04 jruoho Exp $
+.\ $NetBSD: cdefs.3,v 1.4 2013/10/27 10:05:15 apb Exp $
 .\
 .\ Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -56,6 +56,7 @@ type qualifier from
 Macros and definitions specific to compilers, preprocessors, and linkers; see
 .Xr __CONCAT 3 ,
 .Xr __UNCONST 3 ,
+.Xr __USE 3 ,
 .Xr __insn_barrier 3 ,
 and
 .Xr attribute 3 .
@@ -88,7 +89,7 @@ included as the first thing right after 
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: cdefs.3,v 1.3 2011/04/08 07:55:04 jruoho Exp $);
+__RCSID($NetBSD: cdefs.3,v 1.4 2013/10/27 10:05:15 apb Exp $);
 .Ed
 .Pp
 It is possible to identify the

CVS commit: src/external/historical/nawk/dist

2013-10-27 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Oct 27 10:06:01 UTC 2013

Modified Files:
src/external/historical/nawk/dist: run.c

Log Message:
Fix memory leak in gensub()


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/historical/nawk/dist/run.c

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

Modified files:

Index: src/external/historical/nawk/dist/run.c
diff -u src/external/historical/nawk/dist/run.c:1.6 src/external/historical/nawk/dist/run.c:1.7
--- src/external/historical/nawk/dist/run.c:1.6	Sat Dec 29 02:44:26 2012
+++ src/external/historical/nawk/dist/run.c	Sun Oct 27 10:06:01 2013
@@ -2074,6 +2074,7 @@ Cell *gensub(Node **a, int nnn)	/* globa
 	x = execute(a[4]);	/* source string */
 	t = getsval(x);
 	res = copycell(x);	/* target string - initially copy of source */
+	res-csub = CTEMP;	/* result values are temporary */
 	if (a[0] == 0)		/* 0 = a[1] is already-compiled regexpr */
 		pfa = (fa *) a[1];	/* regular expression */
 	else {

CVS commit: src/share/man/man7

2013-10-27 Thread Alan Barrett 
Module Name:src
Committed By:   apb
Date:   Sun Oct 27 10:09:28 UTC 2013

Modified Files:
src/share/man/man7: sysctl.7

Log Message:
vfs.wapbl.flush_disk_cache is more about metadata than data, and
more about safety in the event of power loss than safety in the
event of a crash.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/share/man/man7/sysctl.7

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/man7/sysctl.7
diff -u src/share/man/man7/sysctl.7:1.76 src/share/man/man7/sysctl.7:1.77
--- src/share/man/man7/sysctl.7:1.76	Wed Apr 10 00:24:28 2013
+++ src/share/man/man7/sysctl.7	Sun Oct 27 10:09:28 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: sysctl.7,v 1.76 2013/04/10 00:24:28 wiz Exp $
+.\	$NetBSD: sysctl.7,v 1.77 2013/10/27 10:09:28 apb Exp $
 .\
 .\ Copyright (c) 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
 .\
-.Dd April 9, 2013
+.Dd October 27, 2013
 .Dt SYSCTL 7
 .Os
 .Sh NAME
@@ -164,8 +164,8 @@ capabilities with the following third le
 .Bl -tag -width 123456
 .It Li vfs.wapbl.flush_disk_cache
 Controls whether to attempt to flush the disk cache on each commit.
-It defaults to 1 and it should always be on to ensure data integrity in
-case of a crash.
+It defaults to 1 and it should always be on to ensure integrity
+of file system metadata in the event of a power loss.
 For slow disks, turning it off can improve performance.
 .It Li vfs.wapbl.verbose_commit
 For each transaction log commit, print the number of bytes written

CVS commit: src/usr.bin/make

2013-10-27 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sun Oct 27 11:38:13 UTC 2013

Modified Files:
src/usr.bin/make: make.1

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/usr.bin/make/make.1

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

Modified files:

Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.224 src/usr.bin/make/make.1:1.225
--- src/usr.bin/make/make.1:1.224	Fri Oct 25 22:05:00 2013
+++ src/usr.bin/make/make.1	Sun Oct 27 11:38:13 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: make.1,v 1.224 2013/10/25 22:05:00 apb Exp $
+.\	$NetBSD: make.1,v 1.225 2013/10/27 11:38:13 wiz Exp $
 .\
 .\ Copyright (c) 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -745,7 +745,7 @@ then output for each target is prefixed 
 .Ql --- target ---
 the first part of which can be controlled via
 .Va .MAKE.JOB.PREFIX .
-If 
+If
 .Va .MAKE.JOB.PREFIX
 is empty, no token is printed.
 .br

CVS commit: src/share/man/man4

2013-10-27 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sun Oct 27 11:41:38 UTC 2013

Modified Files:
src/share/man/man4: axen.4

Log Message:
Fix date and remove superfluous comma.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/axen.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/axen.4
diff -u src/share/man/man4/axen.4:1.1 src/share/man/man4/axen.4:1.2
--- src/share/man/man4/axen.4:1.1	Sat Oct 26 09:16:19 2013
+++ src/share/man/man4/axen.4	Sun Oct 27 11:41:38 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: axen.4,v 1.1 2013/10/26 09:16:19 nonaka Exp $
+.\	$NetBSD: axen.4,v 1.2 2013/10/27 11:41:38 wiz Exp $
 .\	$OpenBSD: axen.4,v 1.2 2013/10/07 07:18:36 jmc Exp $
 .\
 .\ Copyright (c) 2013 Yojiro UO y...@nui.org
@@ -15,7 +15,7 @@
 .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\
-.Dd $Mdocdate: October 26 2013 $
+.Dd October 26, 2013
 .Dt AXEN 4
 .Os
 .Sh NAME
@@ -78,7 +78,7 @@ before a timeout expired.
 The
 .Nm
 device driver first appeared in
-.Ox 5.4 ,
+.Ox 5.4
 and in
 .Nx 7.0 .
 .Sh AUTHORS

CVS commit: src/share/man/man3lua

2013-10-27 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 27 11:43:07 UTC 2013

Modified Files:
src/share/man/man3lua: gpio.3lua

Log Message:
missing word


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man3lua/gpio.3lua

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/man3lua/gpio.3lua
diff -u src/share/man/man3lua/gpio.3lua:1.1 src/share/man/man3lua/gpio.3lua:1.2
--- src/share/man/man3lua/gpio.3lua:1.1	Sat Oct 26 10:48:19 2013
+++ src/share/man/man3lua/gpio.3lua	Sun Oct 27 11:43:07 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: gpio.3lua,v 1.1 2013/10/26 10:48:19 mbalmer Exp $
+.\	$NetBSD: gpio.3lua,v 1.2 2013/10/27 11:43:07 mbalmer Exp $
 .\
 .\ Copyright (c) 2013 Marc Balmer mbal...@netbsd.org. All rights reserved.
 .\
@@ -27,7 +27,7 @@
 .\ SUCH DAMAGE.
 .\
 .\
-.Dd October 26, 2013
+.Dd October 27, 2013
 .Dt GPIO 3lua
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@ pins from Lua
 .Sh DESCRIPTION
 The
 .Nm
-Lua provides access to a
+Lua binding provides access to a
 .Xr gpio 4
 device using the
 .Xr ioctl 2

CVS commit: src

2013-10-27 Thread Alan Barrett 
Module Name:src
Committed By:   apb
Date:   Sun Oct 27 11:56:19 UTC 2013

Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man3: Makefile

Log Message:
Add man mage links for __debugused(3) and __diagused(3).


To generate a diff of this commit:
cvs rdiff -u -r1.1850 -r1.1851 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.82 -r1.83 src/share/man/man3/Makefile

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.1850 src/distrib/sets/lists/comp/mi:1.1851
--- src/distrib/sets/lists/comp/mi:1.1850	Sun Oct 27 09:27:23 2013
+++ src/distrib/sets/lists/comp/mi	Sun Oct 27 11:56:18 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1850 2013/10/27 09:27:23 apb Exp $
+#	$NetBSD: mi,v 1.1851 2013/10/27 11:56:18 apb Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -4555,6 +4555,8 @@
 ./usr/share/man/cat3/__cacheline_aligned.0	comp-c-catman		.cat
 ./usr/share/man/cat3/__constfunc.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__dead.0			comp-c-catman		.cat
+./usr/share/man/cat3/__debugused.0		comp-c-catman		.cat
+./usr/share/man/cat3/__diagused.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__insn_barrier.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__noinline.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__packed.0			comp-c-catman		.cat
@@ -11160,6 +11162,8 @@
 ./usr/share/man/html3/__cacheline_aligned.html	comp-c-htmlman		html
 ./usr/share/man/html3/__constfunc.html		comp-c-htmlman		html
 ./usr/share/man/html3/__dead.html		comp-c-htmlman		html
+./usr/share/man/html3/__debugused.html		comp-c-htmlman		html
+./usr/share/man/html3/__diagused.html		comp-c-htmlman		html
 ./usr/share/man/html3/__insn_barrier.html	comp-c-htmlman		html
 ./usr/share/man/html3/__noinline.html		comp-c-htmlman		html
 ./usr/share/man/html3/__packed.html		comp-c-htmlman		html
@@ -17567,6 +17571,8 @@
 ./usr/share/man/man3/__cacheline_aligned.3	comp-c-man		.man
 ./usr/share/man/man3/__constfunc.3		comp-c-man		.man
 ./usr/share/man/man3/__dead.3			comp-c-man		.man
+./usr/share/man/man3/__debugused.3		comp-c-man		.man
+./usr/share/man/man3/__diagused.3		comp-c-man		.man
 ./usr/share/man/man3/__insn_barrier.3		comp-c-man		.man
 ./usr/share/man/man3/__noinline.3		comp-c-man		.man
 ./usr/share/man/man3/__packed.3			comp-c-man		.man

Index: src/share/man/man3/Makefile
diff -u src/share/man/man3/Makefile:1.82 src/share/man/man3/Makefile:1.83
--- src/share/man/man3/Makefile:1.82	Thu Oct 17 16:50:36 2013
+++ src/share/man/man3/Makefile	Sun Oct 27 11:56:18 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.82 2013/10/17 16:50:36 christos Exp $
+#	$NetBSD: Makefile,v 1.83 2013/10/27 11:56:18 apb Exp $
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
 
 MAN=	_DIAGASSERT.3 __CONCAT.3 __UNCONST.3 __USE.3 CMSG_DATA.3 \
@@ -26,6 +26,8 @@ MLINKS+=attribute.3 __dead.3 \
 	attribute.3 __noinline.3 \
 	attribute.3 __unused.3 \
 	attribute.3 __used.3 \
+	attribute.3 __diagused.3 \
+	attribute.3 __debugused.3 \
 	attribute.3 __packed.3 \
 	attribute.3 __aligned.3 \
 	attribute.3 __section.3 \

CVS commit: src/lib/lua/sqlite

2013-10-27 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 27 12:38:08 UTC 2013

Modified Files:
src/lib/lua/sqlite: sqlite.c

Log Message:
More user friendly sqlite.open() function.
Add a few more symbols.
Register all function in the sqlite table.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/lua/sqlite/sqlite.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/lua/sqlite/sqlite.c
diff -u src/lib/lua/sqlite/sqlite.c:1.5 src/lib/lua/sqlite/sqlite.c:1.6
--- src/lib/lua/sqlite/sqlite.c:1.5	Fri Nov  2 12:24:52 2012
+++ src/lib/lua/sqlite/sqlite.c	Sun Oct 27 12:38:08 2013
@@ -1,7 +1,7 @@
-/*	$NetBSD: sqlite.c,v 1.5 2012/11/02 12:24:52 mbalmer Exp $ */
+/*	$NetBSD: sqlite.c,v 1.6 2013/10/27 12:38:08 mbalmer Exp $ */
 
 /*
- * Copyright (c) 2011 Marc Balmer m...@msys.ch
+ * Copyright (c) 2011, 2013 Marc Balmer m...@msys.ch
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,11 +81,14 @@ sqlite_open(lua_State *L)
 	sqlite3 **db;
 
 	db = lua_newuserdata(L, sizeof(sqlite3 *));
-	lua_pushinteger(L, sqlite3_open_v2(luaL_checkstring(L, -3), db,
-	(int)luaL_checkinteger(L, -2), NULL));
-
 	luaL_getmetatable(L, SQLITE_DB_METATABLE);
-	lua_setmetatable(L, -3);
+	lua_setmetatable(L, -2);
+
+	if (lua_gettop(L)  2)
+		lua_pushinteger(L, sqlite3_open_v2(luaL_checkstring(L, -3), db,
+		(int)luaL_checkinteger(L, -2), NULL));
+	else
+		lua_pushinteger(L, sqlite3_open(luaL_checkstring(L, -2), db));
 	return 2;
 
 }
@@ -362,8 +365,10 @@ static const struct constant sqlite_cons
 	{ INTERRUPT,		SQLITE_INTERRUPT },
 	{ IOERR,		SQLITE_IOERR },
 	{ CORRUPT,		SQLITE_CORRUPT },
+	{ NOTFOUND,		SQLITE_NOTFOUND },
 	{ FULL,		SQLITE_FULL },
 	{ CANTOPEN,		SQLITE_CANTOPEN },
+	{ PROTOCOL,		SQLITE_PROTOCOL },
 	{ EMPTY,		SQLITE_EMPTY },
 	{ SCHEMA,		SQLITE_SCHEMA },
 	{ TOOBIG,		SQLITE_TOOBIG },
@@ -375,14 +380,13 @@ static const struct constant sqlite_cons
 	{ FORMAT,		SQLITE_FORMAT },
 	{ RANGE,		SQLITE_RANGE },
 	{ NOTADB,		SQLITE_NOTADB },
-
 	{ ROW,		SQLITE_ROW },
 	{ DONE,		SQLITE_DONE },
 
 	/* File modes */
 	{ OPEN_READONLY,	SQLITE_OPEN_READONLY },
 	{ OPEN_READWRITE,	SQLITE_OPEN_READWRITE },
-	{ OPEN_CREATE,	SQLITE_OPEN_CREATE },
+	{ OPEN_CREATE,	SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE },
 
 	{ NULL,			0 }
 };
@@ -391,14 +395,14 @@ static void
 gpio_set_info(lua_State *L)
 {
 	lua_pushliteral(L, _COPYRIGHT);
-	lua_pushliteral(L, Copyright (C) 2011, 2012 by 
+	lua_pushliteral(L, Copyright (C) 2011, 2012, 2013 by 
 	Marc Balmer m...@msys.ch);
 	lua_settable(L, -3);
 	lua_pushliteral(L, _DESCRIPTION);
 	lua_pushliteral(L, SQLite interface for Lua);
 	lua_settable(L, -3);
 	lua_pushliteral(L, _VERSION);
-	lua_pushliteral(L, sqlite 1.0.2);
+	lua_pushliteral(L, sqlite 1.0.3);
 	lua_settable(L, -3);
 }
 
@@ -443,6 +447,8 @@ luaopen_sqlite(lua_State* L)
 	sqlite3_initialize();
 
 	luaL_register(L, sqlite, sqlite_methods);
+	luaL_register(L, NULL, db_methods);
+	luaL_register(L, NULL, stmt_methods);
 	gpio_set_info(L);
 
 	/* The database connection metatable */

CVS commit: src

2013-10-27 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 27 12:47:54 UTC 2013

Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man3lua: Makefile
Added Files:
src/share/man/man3lua: sqlite.3lua

Log Message:
add a sqlite(3lua) manual page


To generate a diff of this commit:
cvs rdiff -u -r1.1444 -r1.1445 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.2 -r1.3 src/share/man/man3lua/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man3lua/sqlite.3lua

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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1444 src/distrib/sets/lists/man/mi:1.1445
--- src/distrib/sets/lists/man/mi:1.1444	Sun Oct 27 09:27:23 2013
+++ src/distrib/sets/lists/man/mi	Sun Oct 27 12:47:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1444 2013/10/27 09:27:23 apb Exp $
+# $NetBSD: mi,v 1.1445 2013/10/27 12:47:54 mbalmer Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -648,6 +648,7 @@
 ./usr/share/man/cat3lua/gpio.unset.0		man-sys-catman		.cat
 ./usr/share/man/cat3lua/gpio.write.0		man-sys-catman		.cat
 ./usr/share/man/cat3lua/intro.0			man-sys-catman		.cat
+./usr/share/man/cat3lua/sqlite.0		man-sys-catman		.cat
 ./usr/share/man/cat4/aac.0			man-sys-catman		.cat
 ./usr/share/man/cat4/ac97.0			man-sys-catman		.cat
 ./usr/share/man/cat4/acardide.0			man-sys-catman		.cat
@@ -3691,6 +3692,7 @@
 ./usr/share/man/html3lua/gpio.unset.html	man-sys-htmlman		html
 ./usr/share/man/html3lua/gpio.write.html	man-sys-htmlman		html
 ./usr/share/man/html3lua/intro.html		man-sys-htmlman		html
+./usr/share/man/html3lua/sqlite.html		man-sys-htmlman		html
 ./usr/share/man/html4/aac.html			man-sys-htmlman		html
 ./usr/share/man/html4/ac97.html			man-sys-htmlman		html
 ./usr/share/man/html4/acardide.html		man-sys-htmlman		html
@@ -6408,6 +6410,7 @@
 ./usr/share/man/man3lua/gpio.unset.3lua		man-sys-man		.man
 ./usr/share/man/man3lua/gpio.write.3lua		man-sys-man		.man
 ./usr/share/man/man3lua/intro.3lua		man-sys-man		.man
+./usr/share/man/man3lua/sqlite.3lua		man-sys-man		.man
 ./usr/share/man/man4/aac.4			man-sys-man		.man
 ./usr/share/man/man4/ac97.4			man-sys-man		.man
 ./usr/share/man/man4/acardide.4			man-sys-man		.man

Index: src/share/man/man3lua/Makefile
diff -u src/share/man/man3lua/Makefile:1.2 src/share/man/man3lua/Makefile:1.3
--- src/share/man/man3lua/Makefile:1.2	Sat Oct 26 10:48:19 2013
+++ src/share/man/man3lua/Makefile	Sun Oct 27 12:47:54 2013
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2013/10/26 10:48:19 mbalmer Exp $
+#	$NetBSD: Makefile,v 1.3 2013/10/27 12:47:54 mbalmer Exp $
 
-MAN=	gpio.3lua intro.3lua
+MAN=	gpio.3lua intro.3lua sqlite.3lua
 
 MLINKS+=gpio.3lua gpio.open.3lua \
 	gpio.3lua gpio.info.3lua \

Added files:

Index: src/share/man/man3lua/sqlite.3lua
diff -u /dev/null src/share/man/man3lua/sqlite.3lua:1.1
--- /dev/null	Sun Oct 27 12:47:54 2013
+++ src/share/man/man3lua/sqlite.3lua	Sun Oct 27 12:47:54 2013
@@ -0,0 +1,323 @@
+.\	$NetBSD: sqlite.3lua,v 1.1 2013/10/27 12:47:54 mbalmer Exp $
+.\
+.\ Copyright (c) 2013 Marc Balmer mbal...@netbsd.org. 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.
+.\ 3. Neither the name of the University nor the names of its contributors
+.\may be used to endorse or promote products derived from this software
+.\without specific prior written permission.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 28, 2013
+.Dt SQLITE 3lua
+.Os
+.Sh NAME
+.Nm sqlite
+.Nd access
+SQLite3 files from Lua
+.Sh SYNOPSIS
+.Cd local sqlite = require 'sqlite'
+.Pp
+.Bl -tag -width  -compact
+.\
+.\ GENERAL FUNCTIONS
+.\
+.It Dv err =

CVS commit: src/sys/rump/net/lib/libvirtif

2013-10-27 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Sun Oct 27 16:03:20 UTC 2013

Modified Files:
src/sys/rump/net/lib/libvirtif: rumpcomp_user.c rumpcomp_user.h

Log Message:
Give the hypercall interface a version number.  This is for
implementations outside of the tree.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/libvirtif/rumpcomp_user.h

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

Modified files:

Index: src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
diff -u src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.10 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.11
--- src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.10	Tue Jul 16 21:14:42 2013
+++ src/sys/rump/net/lib/libvirtif/rumpcomp_user.c	Sun Oct 27 16:03:19 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpcomp_user.c,v 1.10 2013/07/16 21:14:42 pooka Exp $	*/
+/*	$NetBSD: rumpcomp_user.c,v 1.11 2013/10/27 16:03:19 pooka Exp $	*/
 
 /*
  * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
@@ -48,6 +48,10 @@
 #include if_virt.h
 #include rumpcomp_user.h
 
+#if VIFHYPER_REVISION != 20130704
+#error VIFHYPER_REVISION mismatch
+#endif
+
 struct virtif_user {
 	int viu_fd;
 	int viu_dying;

Index: src/sys/rump/net/lib/libvirtif/rumpcomp_user.h
diff -u src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.4 src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.5
--- src/sys/rump/net/lib/libvirtif/rumpcomp_user.h:1.4	Thu Jul  4 11:46:51 2013
+++ src/sys/rump/net/lib/libvirtif/rumpcomp_user.h	Sun Oct 27 16:03:19 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpcomp_user.h,v 1.4 2013/07/04 11:46:51 pooka Exp $	*/
+/*	$NetBSD: rumpcomp_user.h,v 1.5 2013/10/27 16:03:19 pooka Exp $	*/
 
 /*
  * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
@@ -27,6 +27,8 @@
 
 struct virtif_user;
 
+#define VIFHYPER_REVISION 20130704
+
 int 	VIFHYPER_CREATE(int, struct virtif_user **);
 void	VIFHYPER_DYING(struct virtif_user *);
 void	VIFHYPER_DESTROY(struct virtif_user *);

CVS commit: src/doc

2013-10-27 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Oct 27 16:18:30 UTC 2013

Modified Files:
src/doc: CHANGES

Log Message:
Note some BPF and NPF changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1858 -r1.1859 src/doc/CHANGES

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1858 src/doc/CHANGES:1.1859
--- src/doc/CHANGES:1.1858	Sun Oct 27 02:25:03 2013
+++ src/doc/CHANGES	Sun Oct 27 16:18:30 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1858 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1859 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -94,8 +94,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	kernel: Add malo(4), a driver for Marvell Libertas IEEE 802.11b/g
 		wireless network devices, ported from OpenBSD.
 		[degroote 20120730]
-	kernel: Add BPF JIT compiler, currently supporting amd64 and i386.
-		[rmind 20120802]
 	kernel, libc: Add modctl(MODCTL_EXISTS, ...) to determine if modules
 		can be loaded. [jnemeth 20120803]
 	modstat(8): Add -A, -a, and -e options for testing module loadability.
@@ -134,6 +132,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	libc: Import tzcode2012g. [christos 20121023]
 	zoneinfo: Import tzdata2012h. [apb 20121027]
 	libc: Update to tzcode2012h. [christos 20121028]
+	kernel: Import sljit and add BPF JIT compiler. [alnsn 20121028]
 	flock(1): Add a utility to provide locks to shell scripts similar
 		to shlock(1) [christos 20121101]
 	zoneinfo: Import tzdata2012i. [apb 20121104]
@@ -278,6 +277,10 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	xsh(4): Add driver for Individual Computers X-Surf 100 network interface
 		card. [rkujawa 20130808]
 	postfix(1): Import version 2.9.7 [tron 20130821]
+	kernel: Add BPF coprocessor support (BPF_COP/BPF_COPX instructions).
+		[rmind 20130829]
+	npf: Convert NPF to use BPF byte-code by default.  Many other
+		improvements. [rmind 20130929]
 	less(1): Import version 458 [tron 20130804]
 	mpl115a(4): Add driver for Freescale MPL115A2 I2C absolute pressure 
 		sensor. [rkujawa 20130908]

CVS commit: src/sys/kern

2013-10-27 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Oct 27 16:19:33 UTC 2013

Modified Files:
src/sys/kern: vfs_subr.c

Log Message:
vttodt_tab: index in C99 way, makes it less error-prone.


To generate a diff of this commit:
cvs rdiff -u -r1.438 -r1.439 src/sys/kern/vfs_subr.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_subr.c
diff -u src/sys/kern/vfs_subr.c:1.438 src/sys/kern/vfs_subr.c:1.439
--- src/sys/kern/vfs_subr.c:1.438	Mon Sep 30 18:58:00 2013
+++ src/sys/kern/vfs_subr.c	Sun Oct 27 16:19:33 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_subr.c,v 1.438 2013/09/30 18:58:00 hannken Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.439 2013/10/27 16:19:33 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.438 2013/09/30 18:58:00 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_subr.c,v 1.439 2013/10/27 16:19:33 rmind Exp $);
 
 #include opt_ddb.h
 #include opt_compat_netbsd.h
@@ -903,16 +903,16 @@ setrootfstime(time_t t)
 	rootfstime = t;
 }
 
-static const uint8_t vttodt_tab[9] = {
-	DT_UNKNOWN,	/* VNON  */
-	DT_REG,		/* VREG  */
-	DT_DIR,		/* VDIR  */
-	DT_BLK,		/* VBLK  */
-	DT_CHR,		/* VCHR  */
-	DT_LNK,		/* VLNK  */
-	DT_SOCK,	/* VSUCK */
-	DT_FIFO,	/* VFIFO */
-	DT_UNKNOWN	/* VBAD  */
+static const uint8_t vttodt_tab[ ] = {
+	[VNON]	=	DT_UNKNOWN,
+	[VREG]	=	DT_REG,
+	[VDIR]	=	DT_DIR,
+	[VBLK]	=	DT_BLK,
+	[VCHR]	=	DT_CHR,
+	[VLNK]	=	DT_LNK,
+	[VSOCK]	=	DT_SOCK,
+	[VFIFO]	=	DT_FIFO,
+	[VBAD]	=	DT_UNKNOWN
 };
 
 uint8_t

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

2013-10-27 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Oct 27 16:25:01 UTC 2013

Modified Files:
src/sys/arch/amd64/amd64: fpu.c

Log Message:
- fpu_state_save() on amd64: ci-ci_fpsaving is no longer used, simplify.
- Remove some unnecessary header inclusions.  Misc clean up while here.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/amd64/fpu.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/amd64/amd64/fpu.c
diff -u src/sys/arch/amd64/amd64/fpu.c:1.41 src/sys/arch/amd64/amd64/fpu.c:1.42
--- src/sys/arch/amd64/amd64/fpu.c:1.41	Wed Oct 23 20:18:50 2013
+++ src/sys/arch/amd64/amd64/fpu.c	Sun Oct 27 16:25:01 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.41 2013/10/23 20:18:50 drochner Exp $	*/
+/*	$NetBSD: fpu.c,v 1.42 2013/10/27 16:25:01 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.  All
@@ -95,24 +95,13 @@
  *	@(#)npx.c	7.2 (Berkeley) 5/12/91
  */
 
-/*
- * XXXfvdl update copyright notice. this started out as a stripped isa/npx.c
- */
-
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.41 2013/10/23 20:18:50 drochner Exp $);
-
-#include opt_multiprocessor.h
+__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.42 2013/10/27 16:25:01 rmind Exp $);
 
 #include sys/param.h
 #include sys/systm.h
-#include sys/conf.h
 #include sys/cpu.h
-#include sys/file.h
 #include sys/proc.h
-#include sys/ioctl.h
-#include sys/device.h
-#include sys/vmmeter.h
 #include sys/kernel.h
 
 #include sys/bus.h
@@ -134,7 +123,6 @@ __KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.41
 #define stts() HYPERVISOR_fpu_taskswitch(1)
 #endif
 
-
 /*
  * We do lazy initialization and switching using the TS bit in cr0 and the
  * MDL_USEDFPU bit in mdlwp.
@@ -153,8 +141,8 @@ __KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.41
  * state is saved.
  */
 
-void fpudna(struct cpu_info *);
-static int x86fpflags_to_ksiginfo(uint32_t);
+void		fpudna(struct cpu_info *);
+static int	x86fpflags_to_ksiginfo(uint32_t);
 
 /*
  * Init the FPU.
@@ -178,11 +166,10 @@ fpuinit(struct cpu_info *ci)
 void
 fputrap(struct trapframe *frame)
 {
-	register struct lwp *l = curlwp;
+	struct lwp *l = curlwp;
 	struct pcb *pcb = lwp_getpcb(l);
 	struct savefpu *sfp = pcb-pcb_savefpu;
 	uint32_t mxcsr, statbits;
-	uint16_t cw;
 	ksiginfo_t ksi;
 
 	KPREEMPT_DISABLE(l);
@@ -198,6 +185,8 @@ fputrap(struct trapframe *frame)
 		mxcsr = ~0x3f;
 		x86_ldmxcsr(mxcsr);
 	} else {
+		uint16_t cw;
+
 		fninit();
 		fwait();
 		cw = sfp-fp_fxsave.fx_fcw;
@@ -218,7 +207,6 @@ fputrap(struct trapframe *frame)
 static int
 x86fpflags_to_ksiginfo(uint32_t flags)
 {
-	int i;
 	static int x86fp_ksiginfo_table[] = {
 		FPE_FLTINV, /* bit 0 - invalid operation */
 		FPE_FLTRES, /* bit 1 - denormal operand */
@@ -229,12 +217,13 @@ x86fpflags_to_ksiginfo(uint32_t flags)
 		FPE_FLTINV, /* bit 6 - stack fault	*/
 	};
 
-	for (i=0;i  sizeof(x86fp_ksiginfo_table)/sizeof(int); i++) {
-		if (flags  (1  i))
-			return (x86fp_ksiginfo_table[i]);
+	for (u_int i = 0; i  __arraycount(x86fp_ksiginfo_table); i++) {
+		if (flags  (1U  i))
+			return x86fp_ksiginfo_table[i];
 	}
-	/* punt if flags not set */
-	return (FPE_FLTINV);
+
+	/* Punt if flags not set. */
+	return FPE_FLTINV;
 }
 
 /*
@@ -250,24 +239,23 @@ extern const pcu_ops_t fpu_ops;
 void
 fpudna(struct cpu_info *ci)
 {
-
 	pcu_load(fpu_ops);
 }
 
-
 static void
 fpu_state_load(struct lwp *l, u_int flags)
 {
-	uint16_t cw;
-	uint32_t mxcsr;
-	struct pcb * const pcb = lwp_getpcb(l);
+	struct pcb *pcb = lwp_getpcb(l);
 
 	clts();
 	pcb-pcb_cr0 = ~CR0_TS;
-	if (!(flags  PCU_RELOAD))
+	if ((flags  PCU_RELOAD) == 0)
 		return;
 
-	if (!(flags  PCU_LOADED)) {
+	if ((flags  PCU_LOADED) == 0) {
+		uint32_t mxcsr;
+		uint16_t cw;
+
 		fninit();
 		cw = pcb-pcb_savefpu.fp_fxsave.fx_fcw;
 		fldcw(cw);
@@ -281,6 +269,7 @@ fpu_state_load(struct lwp *l, u_int flag
 		 */
 		static const double zero = 0.0;
 		int status;
+
 		/*
 		 * Clear the ES bit in the x87 status word if it is currently
 		 * set, in order to avoid causing a fault in the upcoming load.
@@ -288,6 +277,7 @@ fpu_state_load(struct lwp *l, u_int flag
 		fnstsw(status);
 		if (status  0x80)
 			fnclex();
+
 		/*
 		 * Load the dummy variable into the x87 stack.  This mangles
 		 * the x87 stack, but we don't care since we're about to call
@@ -301,26 +291,16 @@ fpu_state_load(struct lwp *l, u_int flag
 static void
 fpu_state_save(struct lwp *l, u_int flags)
 {
-	struct cpu_info *ci;
-	struct pcb * const pcb = lwp_getpcb(l);
+	struct pcb *pcb = lwp_getpcb(l);
 
-	ci = curcpu();
-	/*
-	 * Set ci-ci_fpsaving, so that any pending exception will
-	 * be thrown away.  It will be caught again if/when the
-	 * FPU state is restored.
-	 */
-	KASSERT(ci-ci_fpsaving == 0);
 	clts();
-	ci-ci_fpsaving = 1;
 	fxsave(pcb-pcb_savefpu);
-	ci-ci_fpsaving = 0;
 }
 
 static void
 fpu_state_release(struct lwp *l, u_int flags)
 {
-	struct pcb * const pcb =

CVS commit: src/lib/librumpuser

2013-10-27 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Oct 27 16:39:47 UTC 2013

Modified Files:
src/lib/librumpuser: rumpuser.c rumpuser_dl.c rumpuser_port.h
rumpuser_pth.c rumpuser_sp.c

Log Message:
librumpuser: add some #ifdef __APPLE__ and missing bits to build it on OS X.
OK pooka@


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.21 -r1.22 src/lib/librumpuser/rumpuser_dl.c \
src/lib/librumpuser/rumpuser_port.h
cvs rdiff -u -r1.33 -r1.34 src/lib/librumpuser/rumpuser_pth.c
cvs rdiff -u -r1.59 -r1.60 src/lib/librumpuser/rumpuser_sp.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/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.54 src/lib/librumpuser/rumpuser.c:1.55
--- src/lib/librumpuser/rumpuser.c:1.54	Wed Aug 14 08:29:25 2013
+++ src/lib/librumpuser/rumpuser.c	Sun Oct 27 16:39:46 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.c,v 1.54 2013/08/14 08:29:25 pooka Exp $	*/
+/*	$NetBSD: rumpuser.c,v 1.55 2013/10/27 16:39:46 rmind Exp $	*/
 
 /*
  * Copyright (c) 2007-2010 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
 #include rumpuser_port.h
 
 #if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.54 2013/08/14 08:29:25 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.55 2013/10/27 16:39:46 rmind Exp $);
 #endif /* !lint */
 
 #include sys/ioctl.h
@@ -43,7 +43,12 @@ __RCSID($NetBSD: rumpuser.c,v 1.54 2013
 #include sys/dkio.h
 #endif
 
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || \
+defined(__DragonFly__) || defined(__APPLE__)
+#define	__BSD__
+#endif
+
+#if defined(__BSD__)
 #include sys/sysctl.h
 #endif
 
@@ -533,7 +538,7 @@ gethostncpu(void)
 {
 	int ncpu = 1;
 
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__BSD__)
 	size_t sz = sizeof(ncpu);
 
 	sysctlbyname(hw.ncpu, ncpu, sz, NULL, 0);
@@ -607,7 +612,7 @@ rumpuser_putchar(int c)
 	putchar(c);
 }
 
-void
+__dead void
 rumpuser_exit(int rv)
 {
 

Index: src/lib/librumpuser/rumpuser_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.21 src/lib/librumpuser/rumpuser_dl.c:1.22
--- src/lib/librumpuser/rumpuser_dl.c:1.21	Tue Jul 30 18:56:03 2013
+++ src/lib/librumpuser/rumpuser_dl.c	Sun Oct 27 16:39:46 2013
@@ -1,4 +1,4 @@
-/*  $NetBSD: rumpuser_dl.c,v 1.21 2013/07/30 18:56:03 pooka Exp $	*/
+/*  $NetBSD: rumpuser_dl.c,v 1.22 2013/10/27 16:39:46 rmind Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -40,7 +40,7 @@
 #include rumpuser_port.h
 
 #if !defined(lint)
-__RCSID($NetBSD: rumpuser_dl.c,v 1.21 2013/07/30 18:56:03 pooka Exp $);
+__RCSID($NetBSD: rumpuser_dl.c,v 1.22 2013/10/27 16:39:46 rmind Exp $);
 #endif /* !lint */
 
 #include sys/types.h
@@ -48,7 +48,6 @@ __RCSID($NetBSD: rumpuser_dl.c,v 1.21 2
 #include assert.h
 
 #include dlfcn.h
-#include elf.h
 #include errno.h
 #include fcntl.h
 #include stdio.h
@@ -61,6 +60,7 @@ __RCSID($NetBSD: rumpuser_dl.c,v 1.21 2
 #if defined(__ELF__)  (defined(__NetBSD__) || defined(__FreeBSD__)	\
 || (defined(__sun__)  defined(__svr4__))) || defined(__linux__)	\
 || defined(__DragonFly__)
+#include elf.h
 #include link.h
 
 static size_t symtabsize = 0, strtabsize = 0;
Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.21 src/lib/librumpuser/rumpuser_port.h:1.22
--- src/lib/librumpuser/rumpuser_port.h:1.21	Tue Sep 10 17:58:39 2013
+++ src/lib/librumpuser/rumpuser_port.h	Sun Oct 27 16:39:46 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_port.h,v 1.21 2013/09/10 17:58:39 pooka Exp $	*/
+/*	$NetBSD: rumpuser_port.h,v 1.22 2013/10/27 16:39:46 rmind Exp $	*/
 
 /*
  * Portability header for non-NetBSD platforms.
@@ -68,15 +68,43 @@
 #  endif
 #endif
 
+#if defined(__APPLE__)
+#define	__dead		__attribute__((noreturn))
+#include sys/cdefs.h
+
+#include libkern/OSAtomic.h
+#define	atomic_inc_uint(x)	OSAtomicIncrement32((volatile int32_t *)(x))
+#define	atomic_dec_uint(x)	OSAtomicDecrement32((volatile int32_t *)(x))
+
+#include sys/time.h
+
+#define	CLOCK_REALTIME	0
+typedef int clockid_t;
+
+static inline int
+clock_gettime(clockid_t clk, struct timespec *ts)
+{
+	struct timeval tv;
+
+	if (gettimeofday(tv, 0) == 0) {
+		ts-tv_sec = tv.tv_sec;
+		ts-tv_nsec = tv.tv_usec * 1000;
+	}
+	return -1;
+}
+
+#endif
+
 #include sys/types.h
 #include sys/param.h
 
 /* maybe this should be !__NetBSD__ ? */
 #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__)	\
-|| defined(__DragonFly__) || defined(__CYGWIN__)
+|| defined(__DragonFly__) || defined(__APPLE__) || defined(__CYGWIN__)
 #include errno.h
 #include stdlib.h
 #include string.h
+#include inttypes.h
 
 /* this is inline simply to make this header self-contained */
 static inline int 

Index: src/lib/librumpuser/rumpuser_pth.c
diff -u

CVS commit: src/sys/dev/usb

2013-10-27 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Oct 27 16:59:46 UTC 2013

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
usbdevs: add an entry for external WD disk.


To generate a diff of this commit:
cvs rdiff -u -r1.655 -r1.656 src/sys/dev/usb/usbdevs

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.655 src/sys/dev/usb/usbdevs:1.656
--- src/sys/dev/usb/usbdevs:1.655	Sat Oct  5 22:00:28 2013
+++ src/sys/dev/usb/usbdevs	Sun Oct 27 16:59:46 2013
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.655 2013/10/05 22:00:28 jnemeth Exp $
+$NetBSD: usbdevs,v 1.656 2013/10/27 16:59:46 rmind Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -451,6 +451,7 @@ vendor QUALCOMM		0x1004	Qualcomm
 vendor MOTOROLA4	0x100d	Motorola
 vendor HP3		0x103c	Hewlett Packard
 vendor GIGABYTE		0x1044	GIGABYTE
+vendor WESTERN		0x1058	Western Digital
 vendor MOTOROLA		0x1063	Motorola
 vendor CCYU		0x1065	CCYU Technology
 vendor HYUNDAI		0x106c	Hyundai CuriTel
@@ -3228,6 +3229,9 @@ product WACOM GRAPHIRE4_4X5	0x0015	Graph
 product WACOM INTUOSA5		0x0021	Intuos A5
 product WACOM GD0912U		0x0022	Intuos 9x12 Graphics Tablet
 
+/* Western Digital products */
+product WESTERN EXTHDD		0x0400	External HDD
+
 /* WinChipHead products */
 product WINCHIPHEAD CH341SER	0x5523	CH341/CH340 USB-Serial Bridge
 product WINCHIPHEAD2 CH341	0x7523	CH341 serial/parallel

CVS commit: src/sys/dev/usb

2013-10-27 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Oct 27 17:12:28 UTC 2013

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen usbdevs


To generate a diff of this commit:
cvs rdiff -u -r1.647 -r1.648 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.648 -r1.649 src/sys/dev/usb/usbdevs_data.h

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

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.647 src/sys/dev/usb/usbdevs.h:1.648
--- src/sys/dev/usb/usbdevs.h:1.647	Sat Oct  5 22:01:12 2013
+++ src/sys/dev/usb/usbdevs.h	Sun Oct 27 17:12:28 2013
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.647 2013/10/05 22:01:12 jnemeth Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.648 2013/10/27 17:12:28 rmind Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.655 2013/10/05 22:00:28 jnemeth Exp
+ *	NetBSD: usbdevs,v 1.656 2013/10/27 16:59:46 rmind Exp
  */
 
 /*
@@ -458,6 +458,7 @@
 #define	USB_VENDOR_MOTOROLA4	0x100d		/* Motorola */
 #define	USB_VENDOR_HP3	0x103c		/* Hewlett Packard */
 #define	USB_VENDOR_GIGABYTE	0x1044		/* GIGABYTE */
+#define	USB_VENDOR_WESTERN	0x1058		/* Western Digital */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
 #define	USB_VENDOR_HYUNDAI	0x106c		/* Hyundai CuriTel */
@@ -3235,6 +3236,9 @@
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
 #define	USB_PRODUCT_WACOM_GD0912U	0x0022		/* Intuos 9x12 Graphics Tablet */
 
+/* Western Digital products */
+#define	USB_PRODUCT_WESTERN_EXTHDD	0x0400		/* External HDD */
+
 /* WinChipHead products */
 #define	USB_PRODUCT_WINCHIPHEAD_CH341SER	0x5523		/* CH341/CH340 USB-Serial Bridge */
 #define	USB_PRODUCT_WINCHIPHEAD2_CH341	0x7523		/* CH341 serial/parallel */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.648 src/sys/dev/usb/usbdevs_data.h:1.649
--- src/sys/dev/usb/usbdevs_data.h:1.648	Sat Oct  5 22:01:12 2013
+++ src/sys/dev/usb/usbdevs_data.h	Sun Oct 27 17:12:28 2013
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.648 2013/10/05 22:01:12 jnemeth Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.649 2013/10/27 17:12:28 rmind Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.655 2013/10/05 22:00:28 jnemeth Exp
+ *	NetBSD: usbdevs,v 1.656 2013/10/27 16:59:46 rmind Exp
  */
 
 /*
@@ -1611,6 +1611,10 @@ const struct usb_vendor usb_vendors[] = 
 	GIGABYTE,
 	},
 	{
+	USB_VENDOR_WESTERN,
+	Western Digital,
+	},
+	{
 	USB_VENDOR_MOTOROLA,
 	Motorola,
 	},
@@ -2135,7 +2139,7 @@ const struct usb_vendor usb_vendors[] = 
 	GNU Radio USRP,
 	},
 };
-const int usb_nvendors = 524;
+const int usb_nvendors = 525;
 
 const struct usb_product usb_products[] = {
 	{
@@ -9679,6 +9683,10 @@ const struct usb_product usb_products[] 
 	Intuos 9x12 Graphics Tablet,
 	},
 	{
+	USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_EXTHDD,
+	External HDD,
+	},
+	{
 	USB_VENDOR_WINCHIPHEAD, USB_PRODUCT_WINCHIPHEAD_CH341SER,
 	CH341/CH340 USB-Serial Bridge,
 	},
@@ -10035,4 +10043,4 @@ const struct usb_product usb_products[] 
 	Prestige,
 	},
 };
-const int usb_nproducts = 1974;
+const int usb_nproducts = 1975;

CVS commit: src/usr.bin/calendar/calendars

2013-10-27 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Sun Oct 27 18:30:49 UTC 2013

Modified Files:
src/usr.bin/calendar/calendars: calendar.music

Log Message:
No more walk on the wild side.  RIP Lou Reed.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/calendar/calendars/calendar.music

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

Modified files:

Index: src/usr.bin/calendar/calendars/calendar.music
diff -u src/usr.bin/calendar/calendars/calendar.music:1.16 src/usr.bin/calendar/calendars/calendar.music:1.17
--- src/usr.bin/calendar/calendars/calendar.music:1.16	Sun Jun  7 10:25:39 2009
+++ src/usr.bin/calendar/calendars/calendar.music	Sun Oct 27 18:30:49 2013
@@ -148,6 +148,7 @@
 10/22	Franz Liszt born, 1811
 10/25	Jon Anderson (Yes) is born in Lancashire, England, 1944
 10/25	The Rolling Stones appear on The Ed Sullivan Show, 1964
+10/27	Lou Reed dies aged 71, 2013
 10/29	Duane Allman dies in motorcycle crash near Macon, Georgia, 1971
 10/30	Grace Slick is born in Chicago, 1939
 11/02	Jimi Hendrix's Electric Ladyland enters US charts at \#1, 1968

CVS commit: src/sys/rump/librump/rumpkern

2013-10-27 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Sun Oct 27 20:25:45 UTC 2013

Modified Files:
src/sys/rump/librump/rumpkern: lwproc.c rump_private.h

Log Message:
Enable holding implicit threads over explicit scheduling points (i.e.
a kernel driver calling rump_lwproc_switch()).  Also, correctly handle
curcpu()-ci_curlwp and biglock there.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/librump/rumpkern/lwproc.c
cvs rdiff -u -r1.77 -r1.78 src/sys/rump/librump/rumpkern/rump_private.h

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

Modified files:

Index: src/sys/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.23 src/sys/rump/librump/rumpkern/lwproc.c:1.24
--- src/sys/rump/librump/rumpkern/lwproc.c:1.23	Wed May 15 14:07:26 2013
+++ src/sys/rump/librump/rumpkern/lwproc.c	Sun Oct 27 20:25:45 2013
@@ -1,4 +1,4 @@
-/*  $NetBSD: lwproc.c,v 1.23 2013/05/15 14:07:26 pooka Exp $	*/
+/*  $NetBSD: lwproc.c,v 1.24 2013/10/27 20:25:45 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.23 2013/05/15 14:07:26 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.24 2013/10/27 20:25:45 pooka Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -185,7 +185,6 @@ lwproc_freelwp(struct lwp *l)
 	p = l-l_proc;
 	mutex_enter(p-p_lock);
 
-	/* XXX: l_refcnt */
 	KASSERT(l-l_flag  LW_WEXIT);
 	KASSERT(l-l_refcnt == 0);
 
@@ -352,6 +351,7 @@ rump_lwproc_switch(struct lwp *newlwp)
 		fd_free();
 	}
 
+	KERNEL_UNLOCK_ALL(NULL, l-l_biglocks);
 	rumpuser_curlwpop(RUMPUSER_LWP_CLEAR, l);
 
 	newlwp-l_cpu = newlwp-l_target_cpu = l-l_cpu;
@@ -359,6 +359,8 @@ rump_lwproc_switch(struct lwp *newlwp)
 	newlwp-l_pflag |= LP_RUNNING;
 
 	rumpuser_curlwpop(RUMPUSER_LWP_SET, newlwp);
+	curcpu()-ci_curlwp = newlwp;
+	KERNEL_LOCK(newlwp-l_biglocks, NULL);
 
 	/*
 	 * Check if the thread should get a signal.  This is
@@ -380,21 +382,46 @@ rump_lwproc_switch(struct lwp *newlwp)
 	}
 }
 
+/*
+ * Mark the current thread to be released upon return from
+ * kernel.
+ */
 void
 rump_lwproc_releaselwp(void)
 {
-	struct proc *p;
 	struct lwp *l = curlwp;
 
-	if (l-l_refcnt == 0  l-l_flag  LW_WEXIT)
+	if (l-l_refcnt == 0 || l-l_flag  LW_WEXIT)
 		panic(releasing non-pertinent lwp);
 
-	p = l-l_proc;
-	mutex_enter(p-p_lock);
-	KASSERT(l-l_refcnt != 0);
+	rump__lwproc_lwprele();
+	KASSERT(l-l_refcnt == 0  (l-l_flag  LW_WEXIT));
+}
+
+/*
+ * In-kernel routines used to add and remove references for the
+ * current thread.  The main purpose is to make it possible for
+ * implicit threads to persist over scheduling operations in
+ * rump kernel drivers.  Note that we don't need p_lock in a
+ * rump kernel, since we do refcounting only for curlwp.
+ */
+void
+rump__lwproc_lwphold(void)
+{
+	struct lwp *l = curlwp;
+
+	l-l_refcnt++;
+	l-l_flag = ~LW_WEXIT;
+}
+
+void
+rump__lwproc_lwprele(void)
+{
+	struct lwp *l = curlwp;
+
 	l-l_refcnt--;
-	mutex_exit(p-p_lock);
-	l-l_flag |= LW_WEXIT; /* will be released when unscheduled */
+	if (l-l_refcnt == 0)
+		l-l_flag |= LW_WEXIT;
 }
 
 struct lwp *

Index: src/sys/rump/librump/rumpkern/rump_private.h
diff -u src/sys/rump/librump/rumpkern/rump_private.h:1.77 src/sys/rump/librump/rumpkern/rump_private.h:1.78
--- src/sys/rump/librump/rumpkern/rump_private.h:1.77	Tue Sep 17 23:55:16 2013
+++ src/sys/rump/librump/rumpkern/rump_private.h	Sun Oct 27 20:25:45 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_private.h,v 1.77 2013/09/17 23:55:16 pooka Exp $	*/
+/*	$NetBSD: rump_private.h,v 1.78 2013/10/27 20:25:45 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -108,6 +108,8 @@ extern struct cpu_info *rump_cpu;
 extern bool rump_ttycomponent;
 
 struct lwp *	rump__lwproc_alloclwp(struct proc *);
+void		rump__lwproc_lwphold(void);
+void		rump__lwproc_lwprele(void);
 
 void	rump_cpus_bootstrap(int *);
 void	rump_biglock_init(void);

CVS commit: src/lib/libc/arch/sparc64/gen

2013-10-27 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Mon Oct 28 01:06:36 UTC 2013

Modified Files:
src/lib/libc/arch/sparc64/gen: fpsetmask.c fpsetround.c fpsetsticky.c

Log Message:
convert to ANSI C definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc64/gen/fpsetmask.c \
src/lib/libc/arch/sparc64/gen/fpsetround.c \
src/lib/libc/arch/sparc64/gen/fpsetsticky.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/arch/sparc64/gen/fpsetmask.c
diff -u src/lib/libc/arch/sparc64/gen/fpsetmask.c:1.6 src/lib/libc/arch/sparc64/gen/fpsetmask.c:1.7
--- src/lib/libc/arch/sparc64/gen/fpsetmask.c:1.6	Sat Mar 17 21:35:06 2012
+++ src/lib/libc/arch/sparc64/gen/fpsetmask.c	Mon Oct 28 01:06:36 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetmask.c,v 1.6 2012/03/17 21:35:06 martin Exp $	*/
+/*	$NetBSD: fpsetmask.c,v 1.7 2013/10/28 01:06:36 mrg Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: fpsetmask.c,v 1.6 2012/03/17 21:35:06 martin Exp $);
+__RCSID($NetBSD: fpsetmask.c,v 1.7 2013/10/28 01:06:36 mrg Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include namespace.h
@@ -24,8 +24,7 @@ extern fp_except _softfloat_float_except
 #endif
 
 fp_except
-fpsetmask(mask)
-	fp_except mask;
+fpsetmask(fp_except mask)
 {
 	fp_except old;
 	fp_except new;
Index: src/lib/libc/arch/sparc64/gen/fpsetround.c
diff -u src/lib/libc/arch/sparc64/gen/fpsetround.c:1.6 src/lib/libc/arch/sparc64/gen/fpsetround.c:1.7
--- src/lib/libc/arch/sparc64/gen/fpsetround.c:1.6	Fri Feb 15 09:25:03 2013
+++ src/lib/libc/arch/sparc64/gen/fpsetround.c	Mon Oct 28 01:06:36 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetround.c,v 1.6 2013/02/15 09:25:03 martin Exp $	*/
+/*	$NetBSD: fpsetround.c,v 1.7 2013/10/28 01:06:36 mrg Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: fpsetround.c,v 1.6 2013/02/15 09:25:03 martin Exp $);
+__RCSID($NetBSD: fpsetround.c,v 1.7 2013/10/28 01:06:36 mrg Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include namespace.h
@@ -20,8 +20,7 @@ __weak_alias(fpsetround,_fpsetround)
 #endif
 
 fp_rnd
-fpsetround(rnd_dir)
-	fp_rnd rnd_dir;
+fpsetround(fp_rnd rnd_dir)
 {
 	fp_rnd old;
 	fp_rnd new;
Index: src/lib/libc/arch/sparc64/gen/fpsetsticky.c
diff -u src/lib/libc/arch/sparc64/gen/fpsetsticky.c:1.6 src/lib/libc/arch/sparc64/gen/fpsetsticky.c:1.7
--- src/lib/libc/arch/sparc64/gen/fpsetsticky.c:1.6	Sat Mar 17 21:35:06 2012
+++ src/lib/libc/arch/sparc64/gen/fpsetsticky.c	Mon Oct 28 01:06:36 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetsticky.c,v 1.6 2012/03/17 21:35:06 martin Exp $	*/
+/*	$NetBSD: fpsetsticky.c,v 1.7 2013/10/28 01:06:36 mrg Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: fpsetsticky.c,v 1.6 2012/03/17 21:35:06 martin Exp $);
+__RCSID($NetBSD: fpsetsticky.c,v 1.7 2013/10/28 01:06:36 mrg Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include namespace.h
@@ -24,8 +24,7 @@ extern fp_except _softfloat_float_except
 #endif
 
 fp_except
-fpsetsticky(sticky)
-	fp_except sticky;
+fpsetsticky(fp_except sticky)
 {
 	fp_except old;
 	fp_except new;

CVS commit: src/share/mk

2013-10-27 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Mon Oct 28 01:47:13 UTC 2013

Modified Files:
src/share/mk: bsd.README bsd.dep.mk bsd.own.mk bsd.sys.mk

Log Message:
add MKDEPCXX, that is used for C++ files depend creation.  also
add some missing ${COPTS.${.IMPSRC:T}} and ${CPUFLAGS.${.IMPSRC:T}}
to the dependancy rules.

this makes it possible to have C++ files .d files created with the
C++ compiler, and with the normal options for this file, which
means that we can build libstdc++-v3 from gcc 4.8.


To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 src/share/mk/bsd.README
cvs rdiff -u -r1.77 -r1.78 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.753 -r1.754 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.228 -r1.229 src/share/mk/bsd.sys.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.README
diff -u src/share/mk/bsd.README:1.320 src/share/mk/bsd.README:1.321
--- src/share/mk/bsd.README:1.320	Sun Sep 29 14:36:25 2013
+++ src/share/mk/bsd.README	Mon Oct 28 01:47:13 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.320 2013/09/29 14:36:25 christos Exp $
+#	$NetBSD: bsd.README,v 1.321 2013/10/28 01:47:13 mrg Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make include files for the NetBSD
@@ -1809,6 +1809,8 @@ MAKE		make(1).  [make]
 
 MKDEP		Construct Makefile dependency list.  [mkdep]
 
+MKDEPCXX	Construct Makefile dependency list for C++ files.  [mkdep]
+
 NM		List symbols from object files.  [nm]
 
 PC		Pascal compiler.  [pc]  (Not present)

Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.77 src/share/mk/bsd.dep.mk:1.78
--- src/share/mk/bsd.dep.mk:1.77	Tue Mar  5 21:59:01 2013
+++ src/share/mk/bsd.dep.mk	Mon Oct 28 01:47:13 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.dep.mk,v 1.77 2013/03/05 21:59:01 christos Exp $
+#	$NetBSD: bsd.dep.mk,v 1.78 2013/10/28 01:47:13 mrg Exp $
 
 # Basic targets
 realdepend:	beforedepend .depend afterdepend
@@ -8,6 +8,7 @@ beforedepend .depend afterdepend: # ensu
 
 # Default values
 MKDEP?=			mkdep
+MKDEPCXX?=		mkdep
 MKDEP_SUFFIXES?=	.o
 
 # Build rules
@@ -61,25 +62,29 @@ _MKDEP_FILEFLAGS=
 	${_MKTARGET_CREATE}
 	${MKDEP} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
 	${CFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+	${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+	${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
 
 .m.d:
 	${_MKTARGET_CREATE}
 	${MKDEP} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
 	${OBJCFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+	${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+	${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
 
 .s.d .S.d:
 	${_MKTARGET_CREATE}
 	${MKDEP} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
 	${AFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${__acpp_flags} ${.IMPSRC}
+	${CPPFLAGS} ${AFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} \
+	${__acpp_flags} ${.IMPSRC}
 
 .C.d .cc.d .cpp.d .cxx.d:
 	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
+	${MKDEPCXX} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
 	${CXXFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+	${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
+	${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
 
 .endif # defined(SRCS)  !empty(SRCS)	# }
 

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.753 src/share/mk/bsd.own.mk:1.754
--- src/share/mk/bsd.own.mk:1.753	Mon Oct 14 16:00:16 2013
+++ src/share/mk/bsd.own.mk	Mon Oct 28 01:47:13 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.753 2013/10/14 16:00:16 joerg Exp $
+#	$NetBSD: bsd.own.mk,v 1.754 2013/10/28 01:47:13 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -271,6 +271,7 @@ LEX=		${TOOLDIR}/bin/${_TOOL_PREFIX}lex
 LINT=		CC=${CC:Q} ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-lint
 LORDER=		NM=${NM:Q} MKTEMP=${TOOL_MKTEMP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}lorder
 MKDEP=		CC=${CC:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}mkdep
+MKDEPCXX=	CC=${CXX:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}mkdep
 PAXCTL=		${TOOLDIR}/bin/${_TOOL_PREFIX}paxctl
 TSORT=		${TOOLDIR}/bin/${_TOOL_PREFIX}tsort -q
 YACC=		${TOOLDIR}/bin/${_TOOL_PREFIX}yacc

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.228 src/share/mk/bsd.sys.mk:1.229
--- src/share/mk/bsd.sys.mk:1.228	Sat Oct 26 03:26:57 2013
+++ src/share/mk/bsd.sys.mk	Mon Oct 28 01:47:13 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.228 2013/10/26 03:26:57 mrg Exp $
+#	$NetBSD: bsd.sys.mk,v 1.229 2013/10/28 01:47:13 mrg Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -176,6 +176,7 @@ HOST_SH?=	/bin/sh
 
 ELF2ECOFF?=	elf2ecoff
 MKDEP?=		mkdep

CVS commit: src/sys/dev/pci

2013-10-27 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Mon Oct 28 05:37:24 UTC 2013

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

Log Message:
 Set maximum read byte count to 2048 for PCI-X BCM5703/5704 devices.
For PCI-X BCM5704, set maximum outstanding split transactions to 0.
Same as Linux tg3 and FreeBSD (part of FreeBSD r204978).


To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/dev/pci/if_bge.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_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.259 src/sys/dev/pci/if_bge.c:1.260
--- src/sys/dev/pci/if_bge.c:1.259	Thu Sep 12 21:11:37 2013
+++ src/sys/dev/pci/if_bge.c	Mon Oct 28 05:37:24 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.259 2013/09/12 21:11:37 martin Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.260 2013/10/28 05:37:24 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.259 2013/09/12 21:11:37 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.260 2013/10/28 05:37:24 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -4166,10 +4166,23 @@ bge_reset(struct bge_softc *sc)
 	pci_conf_write(sc-sc_pc, sc-sc_pcitag, BGE_PCI_CACHESZ, cachesize);
 	pci_conf_write(sc-sc_pc, sc-sc_pcitag, BGE_PCI_CMD, command);
 
-	/* Step 11: disable PCI-X Relaxed Ordering. */
+	/* 57xx step 11: disable PCI-X Relaxed Ordering. */
 	if (sc-bge_flags  BGE_PCIX) {
 		reg = pci_conf_read(sc-sc_pc, sc-sc_pcitag, sc-bge_pcixcap
 		+ PCIX_CMD);
+		/* Set max memory read byte count to 2K */
+		if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5703) {
+			reg = ~PCIX_CMD_BYTECNT_MASK;
+			reg |= PCIX_CMD_BCNT_2048;
+		} else if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5704){
+			/*
+			 * For 5704, set max outstanding split transaction
+			 * field to 0 (0 means it supports 1 request)
+			 */
+			reg = ~(PCIX_CMD_SPLTRANS_MASK
+			| PCIX_CMD_BYTECNT_MASK);
+			reg |= PCIX_CMD_BCNT_2048;
+		}
 		pci_conf_write(sc-sc_pc, sc-sc_pcitag, sc-bge_pcixcap
 		+ PCIX_CMD, reg  ~PCIX_CMD_RELAXED_ORDER);
 	}

CVS commit: src

2013-10-27 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Mon Oct 28 05:41:49 UTC 2013

Modified Files:
src/sys/arch/x86/include: cacheinfo.h
src/usr.sbin/cpuctl/arch: i386.c

Log Message:
Support prefetch size.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/include/cacheinfo.h
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/cpuctl/arch/i386.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/include/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.16 src/sys/arch/x86/include/cacheinfo.h:1.17
--- src/sys/arch/x86/include/cacheinfo.h:1.16	Sat Sep 14 17:21:19 2013
+++ src/sys/arch/x86/include/cacheinfo.h	Mon Oct 28 05:41:49 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cacheinfo.h,v 1.16 2013/09/14 17:21:19 msaitoh Exp $	*/
+/*	$NetBSD: cacheinfo.h,v 1.17 2013/10/28 05:41:49 msaitoh Exp $	*/
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -8,7 +8,10 @@ struct x86_cache_info {
 	uint8_t		cai_desc;
 	uint8_t		cai_associativity;
 	u_int		cai_totalsize; /* #entries for TLB, bytes for cache */
-	u_int		cai_linesize;	/* or page size for TLB */
+	u_int		cai_linesize;	/*
+	 * or page size for TLB,
+	 * or prefetch size
+	 */
 #ifndef _KERNEL
 	const char	*cai_string;
 #endif
@@ -32,8 +35,9 @@ struct x86_cache_info {
 #define CAI_L2_DTLB2	15		/* L2 Data TLB (2/4M pages) */
 #define CAI_L2_STLB	16		/* Shared L2 TLB (4K pages) */
 #define CAI_L2_STLB2	17		/* Shared L2 TLB (4K/2M pages) */
+#define CAI_PREFETCH	18		/* Prefetch */
 
-#define	CAI_COUNT	18
+#define	CAI_COUNT	19
 
 /*
  * AMD Cache Info:
@@ -319,6 +323,9 @@ __CI_TBL(CAI_L3CACHE,  0xe4,   16, 8 * 1
 __CI_TBL(CAI_L3CACHE,  0xea,   24,12 * 1024 * 1024, 64, NULL), \
 __CI_TBL(CAI_L3CACHE,  0xeb,   24,18 * 1024 * 1024, 64, NULL), \
 __CI_TBL(CAI_L3CACHE,  0xec,   24,24 * 1024 * 1024, 64, NULL), \
+__CI_TBL(CAI_PREFETCH, 0xf0,0,   0, 64, NULL), \
+__CI_TBL(CAI_PREFETCH, 0xf1,0,   0,128, NULL), \
+/* 0xff means no cache information in CPUID leaf 2 (and use leaf 4) */ \
 __CI_TBL(0,   0,0,   0,  0, NULL)  \
 }
 

Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.45 src/usr.sbin/cpuctl/arch/i386.c:1.46
--- src/usr.sbin/cpuctl/arch/i386.c:1.45	Mon Oct 21 06:33:11 2013
+++ src/usr.sbin/cpuctl/arch/i386.c	Mon Oct 28 05:41:49 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386.c,v 1.45 2013/10/21 06:33:11 msaitoh Exp $	*/
+/*	$NetBSD: i386.c,v 1.46 2013/10/28 05:41:49 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: i386.c,v 1.45 2013/10/21 06:33:11 msaitoh Exp $);
+__RCSID($NetBSD: i386.c,v 1.46 2013/10/28 05:41:49 msaitoh Exp $);
 #endif /* not lint */
 
 #include sys/types.h
@@ -2005,6 +2005,12 @@ x86_print_cacheinfo(struct cpu_info *ci)
 		if (sep != NULL)
 			aprint_verbose(\n);
 	}
+	if (ci-ci_cinfo[CAI_PREFETCH].cai_linesize != 0) {
+		aprint_verbose_dev(ci-ci_dev, %dB prefetching,
+			ci-ci_cinfo[CAI_PREFETCH].cai_linesize);
+		if (sep != NULL)
+			aprint_verbose(\n);
+	}
 	if (ci-ci_cinfo[CAI_ITLB].cai_totalsize != 0) {
 		sep = print_tlb_config(ci, CAI_ITLB, ITLB, NULL);
 		sep = print_tlb_config(ci, CAI_ITLB2, NULL, sep);