date:20110117

CVS commit: src

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 08:23:57 UTC 2011

Modified Files:
src/lib/libc/arch/powerpc: Makefile.inc
src/lib/libc/arch/powerpc64/sys: __sigtramp2.S
src/sys/arch/amigappc/amigappc: locore.S
src/sys/arch/bebox/bebox: locore.S
src/sys/arch/evbppc/ev64260: ev64260_locore.S
src/sys/arch/evbppc/explora: explora_start.S
src/sys/arch/evbppc/obs405: obs200_locore.S obs600_locore.S
src/sys/arch/evbppc/pmppc: pmppc_locore.S
src/sys/arch/evbppc/virtex: virtex_start.S
src/sys/arch/evbppc/walnut: walnut_start.S
src/sys/arch/ibmnws/ibmnws: locore.S
src/sys/arch/macppc/macppc: locore.S
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/ofppc/ofppc: locore.S
src/sys/arch/powerpc/ibm4xx/openbios: locore.S
src/sys/arch/powerpc/include: asm.h
src/sys/arch/powerpc/powerpc: darwin_commpage_machdep.S lock_stubs.S
ofwreal.S setfault.S setjmp.S sigcode.S
src/sys/arch/prep/prep: locore.S
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S
src/sys/lib/libkern/arch/powerpc: Makefile.inc

Log Message:
Kill _NOREGNAMES.  Everything should be using %rX now.  If it doesn't it
soon will.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/powerpc/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/powerpc64/sys/__sigtramp2.S
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/explora/explora_start.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/obs200_locore.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/obs405/obs600_locore.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/virtex/virtex_start.S
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/walnut/walnut_start.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/ibm4xx/openbios/locore.S
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/powerpc/include/asm.h
cvs rdiff -u -r1.9 -r1.10 \
src/sys/arch/powerpc/powerpc/darwin_commpage_machdep.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/powerpc/lock_stubs.S \
src/sys/arch/powerpc/powerpc/setfault.S \
src/sys/arch/powerpc/powerpc/sigcode.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/powerpc/ofwreal.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/powerpc/setjmp.S
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/prep/prep/locore.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sandpoint/sandpoint/locore.S
cvs rdiff -u -r1.29 -r1.30 src/sys/lib/libkern/arch/powerpc/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/lib/libc/arch/powerpc/Makefile.inc
diff -u src/lib/libc/arch/powerpc/Makefile.inc:1.12 src/lib/libc/arch/powerpc/Makefile.inc:1.13
--- src/lib/libc/arch/powerpc/Makefile.inc:1.12	Sun Jan 16 02:43:10 2011
+++ src/lib/libc/arch/powerpc/Makefile.inc	Mon Jan 17 08:23:53 2011
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.12 2011/01/16 02:43:10 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.13 2011/01/17 08:23:53 matt Exp $
 
 SRCS+=		__sigaction14_sigtramp.c __sigtramp2.S
 
-CPPFLAGS+=	-I. -D_NOREGNAMES
+CPPFLAGS+=	-I.
 
 .if defined(MKSOFTFLOAT)  (${MKSOFTFLOAT} != no)
 .include softfloat/Makefile.inc

Index: src/lib/libc/arch/powerpc64/sys/__sigtramp2.S
diff -u src/lib/libc/arch/powerpc64/sys/__sigtramp2.S:1.2 src/lib/libc/arch/powerpc64/sys/__sigtramp2.S:1.3
--- src/lib/libc/arch/powerpc64/sys/__sigtramp2.S:1.2	Mon Apr 28 20:22:57 2008
+++ src/lib/libc/arch/powerpc64/sys/__sigtramp2.S	Mon Jan 17 08:23:54 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigtramp2.S,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
+/*	$NetBSD: __sigtramp2.S,v 1.3 2011/01/17 08:23:54 matt Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define _NOREGNAMES
 #include SYS.h
 
 /*

Index: src/sys/arch/amigappc/amigappc/locore.S
diff -u src/sys/arch/amigappc/amigappc/locore.S:1.21 src/sys/arch/amigappc/amigappc/locore.S:1.22
--- src/sys/arch/amigappc/amigappc/locore.S:1.21	Fri Mar  5 17:55:42 2010
+++ src/sys/arch/amigappc/amigappc/locore.S	Mon Jan 17 08:23:54 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: locore.S,v 1.21 2010/03/05 17:55:42 phx Exp $   */
+/*  $NetBSD: locore.S,v 1.22 2011/01/17 08:23:54 matt Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -50,7

CVS commit: src/sys/kern

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 08:26:58 UTC 2011

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

Log Message:
If LWP0_MD_INITIALIZER is defined, use it to initalize .l_md (avoid runtime
to do it if possible).


To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/kern/kern_lwp.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/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.153 src/sys/kern/kern_lwp.c:1.154
--- src/sys/kern/kern_lwp.c:1.153	Fri Jan 14 02:06:34 2011
+++ src/sys/kern/kern_lwp.c	Mon Jan 17 08:26:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_lwp.c,v 1.153 2011/01/14 02:06:34 rmind Exp $	*/
+/*	$NetBSD: kern_lwp.c,v 1.154 2011/01/17 08:26:58 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -211,7 +211,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_lwp.c,v 1.153 2011/01/14 02:06:34 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_lwp.c,v 1.154 2011/01/17 08:26:58 matt Exp $);
 
 #include opt_ddb.h
 #include opt_lockdebug.h
@@ -266,6 +266,9 @@
 #ifdef LWP0_CPU_INFO
 	.l_cpu = LWP0_CPU_INFO,
 #endif
+#ifdef LWP0_MD_INITIALIZER
+	.l_md = LWP0_MD_INITIALIZER,
+#endif
 	.l_proc = proc0,
 	.l_lid = 1,
 	.l_flag = LW_SYSTEM,

CVS commit: src/lib

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 09:43:56 UTC 2011

Modified Files:
src/lib/libposix/sys: Makefile.inc
src/lib/librt/sys: Makefile.inc

Log Message:
Add -D_REENTRANT


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libposix/sys/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/lib/librt/sys/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/lib/libposix/sys/Makefile.inc
diff -u src/lib/libposix/sys/Makefile.inc:1.21 src/lib/libposix/sys/Makefile.inc:1.22
--- src/lib/libposix/sys/Makefile.inc:1.21	Sun Jan 16 03:29:36 2011
+++ src/lib/libposix/sys/Makefile.inc	Mon Jan 17 09:43:56 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.21 2011/01/16 03:29:36 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.22 2011/01/17 09:43:56 matt Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/sys
@@ -11,7 +11,7 @@
 CLEANFILES+=	${PSEUDO}
 
 SRCS+=		cerror.S
-CPPFLAGS+=	-D__cerror=__posix_cerror -I../libc
+CPPFLAGS+=	-D__cerror=__posix_cerror -I../libc -D_REENTRANT
 
 ASMDEPS=	${.CURDIR}/sys/Makefile.inc ${ARCHDIR}/SYS.h \
 		${DESTDIR}/usr/include/sys/syscall.h

Index: src/lib/librt/sys/Makefile.inc
diff -u src/lib/librt/sys/Makefile.inc:1.7 src/lib/librt/sys/Makefile.inc:1.8
--- src/lib/librt/sys/Makefile.inc:1.7	Sun Jan 16 03:29:36 2011
+++ src/lib/librt/sys/Makefile.inc	Mon Jan 17 09:43:56 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.7 2011/01/16 03:29:36 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2011/01/17 09:43:56 matt Exp $
 
 .PATH: ${.CURDIR}/sys
 .PATH: ${ARCHDIR}/sys
@@ -13,7 +13,7 @@
 CLEANFILES+=	${ASM}
 
 SRCS+=		cerror.S
-CPPFLAGS+=	-D__cerror=__rt_cerror -I../libc
+CPPFLAGS+=	-D__cerror=__rt_cerror -I../libc -D_REENTRANT
 
 ASMDEPS=	${.CURDIR}/sys/Makefile.inc ${ARCHDIR}/SYS.h \
 		${DESTDIR}/usr/include/sys/syscall.h

CVS commit: src/lib/libc/softfloat

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 10:08:35 UTC 2011

Modified Files:
src/lib/libc/softfloat: Makefile.inc
Added Files:
src/lib/libc/softfloat: eqtf2.c getf2.c gttf2.c letf2.c lttf2.c
negtf2.c netf2.c

Log Message:
Add long double functions for eq,ne,gt,le,ge,lt,neg ops.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/softfloat/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/softfloat/eqtf2.c \
src/lib/libc/softfloat/getf2.c src/lib/libc/softfloat/gttf2.c \
src/lib/libc/softfloat/letf2.c src/lib/libc/softfloat/lttf2.c \
src/lib/libc/softfloat/negtf2.c src/lib/libc/softfloat/netf2.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/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.6 src/lib/libc/softfloat/Makefile.inc:1.7
--- src/lib/libc/softfloat/Makefile.inc:1.6	Sun Dec  6 11:16:26 2009
+++ src/lib/libc/softfloat/Makefile.inc	Mon Jan 17 10:08:35 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.6 2009/12/06 11:16:26 uebayasi Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2011/01/17 10:08:35 matt Exp $
 
 SOFTFLOAT_BITS?=64
 .PATH:		${ARCHDIR}/softfloat \
@@ -14,6 +14,7 @@
 
 SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \
 		eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \
+		eqtf2.c netf2.c gttf2.c getf2.c lttf2.c letf2.c negtf2.c \
 		nexf2.c gtxf2.c gexf2.c negxf2.c unordsf2.c unorddf2.c
 
 SRCS+=		${SRCS.softfloat}

Added files:

Index: src/lib/libc/softfloat/eqtf2.c
diff -u /dev/null src/lib/libc/softfloat/eqtf2.c:1.1
--- /dev/null	Mon Jan 17 10:08:35 2011
+++ src/lib/libc/softfloat/eqtf2.c	Mon Jan 17 10:08:35 2011
@@ -0,0 +1,26 @@
+/* $NetBSD: eqtf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
+
+/*
+ * Written by Matt Thomas, 2011.  This file is in the Public Domain.
+ */
+
+#include sys/cdefs.h
+#if defined(LIBC_SCCS)  !defined(lint)
+__RCSID($NetBSD: eqtf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $);
+#endif /* LIBC_SCCS and not lint */
+
+#include softfloat-for-gcc.h
+#include milieu.h
+#include softfloat.h
+
+#ifdef FLOAT128
+flag __eqtf2(float128, float128);
+
+flag
+__eqtf2(float128 a, float128 b)
+{
+
+	/* libgcc1.c says !(a == b) */
+	return !float128_eq(a, b);
+}
+#endif /* FLOAT128 */
Index: src/lib/libc/softfloat/getf2.c
diff -u /dev/null src/lib/libc/softfloat/getf2.c:1.1
--- /dev/null	Mon Jan 17 10:08:35 2011
+++ src/lib/libc/softfloat/getf2.c	Mon Jan 17 10:08:35 2011
@@ -0,0 +1,28 @@
+/* $NetBSD: getf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
+
+/*
+ * Written by Matt Thomas, 2011.  This file is in the Public Domain.
+ */
+
+#include softfloat-for-gcc.h
+#include milieu.h
+#include softfloat.h
+
+#include sys/cdefs.h
+#if defined(LIBC_SCCS)  !defined(lint)
+__RCSID($NetBSD: getf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $);
+#endif /* LIBC_SCCS and not lint */
+
+#ifdef FLOAT128
+
+flag __getf2(float128, float128);
+
+flag
+__getf2(float128 a, float128 b)
+{
+
+	/* libgcc1.c says (a = b) - 1 */
+	return float128_le(b, a) - 1;
+}
+
+#endif /* FLOAT128 */
Index: src/lib/libc/softfloat/gttf2.c
diff -u /dev/null src/lib/libc/softfloat/gttf2.c:1.1
--- /dev/null	Mon Jan 17 10:08:35 2011
+++ src/lib/libc/softfloat/gttf2.c	Mon Jan 17 10:08:35 2011
@@ -0,0 +1,28 @@
+/* $NetBSD: gttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
+
+/*
+ * Written by Matt Thomas, 2011.  This file is in the Public Domain.
+ */
+
+#include softfloat-for-gcc.h
+#include milieu.h
+#include softfloat.h
+
+#include sys/cdefs.h
+#if defined(LIBC_SCCS)  !defined(lint)
+__RCSID($NetBSD: gttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $);
+#endif /* LIBC_SCCS and not lint */
+
+#ifdef FLOAT128
+
+flag __gttf2(float128, float128);
+
+flag
+__gttf2(float128 a, float128 b)
+{
+
+	/* libgcc1.c says a  b */
+	return float128_lt(b, a);
+}
+
+#endif /* FLOAT128 */
Index: src/lib/libc/softfloat/letf2.c
diff -u /dev/null src/lib/libc/softfloat/letf2.c:1.1
--- /dev/null	Mon Jan 17 10:08:35 2011
+++ src/lib/libc/softfloat/letf2.c	Mon Jan 17 10:08:35 2011
@@ -0,0 +1,28 @@
+/* $NetBSD: letf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
+
+/*
+ * Written by Matt Thomas, 2011.  This file is in the Public Domain.
+ */
+
+#include softfloat-for-gcc.h
+#include milieu.h
+#include softfloat.h
+
+#include sys/cdefs.h
+#if defined(LIBC_SCCS)  !defined(lint)
+__RCSID($NetBSD: letf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $);
+#endif /* LIBC_SCCS and not lint */
+
+#ifdef FLOAT128
+
+flag __letf2(float128, float128);
+
+flag
+__letf2(float128 a, float128 b)
+{
+
+	/* libgcc1.c says 1 - (a = b) */
+	return 1 - float128_le(a, b);
+}
+
+#endif /* FLOAT128 */
Index: src/lib/libc/softfloat/lttf2.c
diff -u /dev/null src/lib/libc/softfloat/lttf2.c:1.1
--- /dev/null	Mon Jan 17 10:08:35 2011
+++ src/lib/libc/softfloat/lttf2.c	Mon Jan 17 10:08:35 2011
@@ -0,0 +1,28 @@
+/* $NetBSD: lttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
+
+/*

CVS commit: src

2011-01-17 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 11:09:08 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: mi
src/share/misc: Makefile
Removed Files:
src/share/misc: operator

Log Message:
Remove /usr/share/misc/operator.


To generate a diff of this commit:
cvs rdiff -u -r1.1567 -r1.1568 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.34 -r1.35 src/share/misc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/share/misc/operator

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.1567 src/distrib/sets/lists/comp/mi:1.1568
--- src/distrib/sets/lists/comp/mi:1.1567	Fri Jan 14 18:12:47 2011
+++ src/distrib/sets/lists/comp/mi	Mon Jan 17 11:09:06 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1567 2011/01/14 18:12:47 njoly Exp $
+#	$NetBSD: mi,v 1.1568 2011/01/17 11:09:06 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -22215,6 +22215,6 @@
 ./usr/share/misc/indent.pro			comp-util-share		share
 ./usr/share/misc/menu_sys.def			comp-c-share		share
 ./usr/share/misc/msg_sys.def			comp-c-share		share
-./usr/share/misc/operator			comp-c-share		share
+./usr/share/misc/operator			comp-obsolete		obsolete
 ./usr/share/misc/stylecomp-c-share		share
 ./var/db/libc.tags comp-c-root

Index: src/share/misc/Makefile
diff -u src/share/misc/Makefile:1.34 src/share/misc/Makefile:1.35
--- src/share/misc/Makefile:1.34	Tue Dec 15 03:38:58 2009
+++ src/share/misc/Makefile	Mon Jan 17 11:09:08 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2009/12/15 03:38:58 christos Exp $
+#	$NetBSD: Makefile,v 1.35 2011/01/17 11:09:08 jruoho Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 NOOBJ=	# defined
@@ -7,7 +7,7 @@
 	birthtoken bsd-family-tree \
 	country domains \
 	eqnchar flowers indent.pro inter.phone language man.template \
-	mdoc.template na.phone na.postal operator style zipcodes
+	mdoc.template na.phone na.postal style zipcodes
 FILESDIR=${BINDIR}/misc

CVS commit: src/share/man/man7

2011-01-17 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 11:19:07 UTC 2011

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

Log Message:
Remove /usr/share/misc/operator.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man7/operator.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/operator.7
diff -u src/share/man/man7/operator.7:1.9 src/share/man/man7/operator.7:1.10
--- src/share/man/man7/operator.7:1.9	Thu Dec 16 19:13:26 2010
+++ src/share/man/man7/operator.7	Mon Jan 17 11:19:07 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: operator.7,v 1.9 2010/12/16 19:13:26 wiz Exp $
+.\	$NetBSD: operator.7,v 1.10 2011/01/17 11:19:07 jruoho Exp $
 .\
 .\ Copyright (c) 1989, 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\	@(#)operator.7	8.1 (Berkeley) 6/9/93
 .\
-.Dd June 9, 1993
+.Dd January 17, 2011
 .Dt OPERATOR 7
 .Os
 .Sh NAME
@@ -55,9 +55,5 @@
 .It \= += -= etc.	right to left
 .It \,	left to right
 .El
-.Sh FILES
-.Bl -tag -width /usr/share/misc/operator -compact
-.It Pa /usr/share/misc/operator
-.El
 .Sh SEE ALSO
 .Xr iso646 3

CVS commit: src/sys/arch/hp700/hp700

2011-01-17 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Jan 17 12:37:46 UTC 2011

Modified Files:
src/sys/arch/hp700/hp700: locore.S

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hp700/hp700/locore.S

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

Modified files:

Index: src/sys/arch/hp700/hp700/locore.S
diff -u src/sys/arch/hp700/hp700/locore.S:1.48 src/sys/arch/hp700/hp700/locore.S:1.49
--- src/sys/arch/hp700/hp700/locore.S:1.48	Wed Jan 12 21:18:23 2011
+++ src/sys/arch/hp700/hp700/locore.S	Mon Jan 17 12:37:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.48 2011/01/12 21:18:23 skrll Exp $	*/
+/*	$NetBSD: locore.S,v 1.49 2011/01/17 12:37:46 skrll Exp $	*/
 /*	$OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $	*/
 
 /*
@@ -385,15 +385,15 @@
 	/*
 	 * load address of interrupt vector table
 	 */
-	ldil	L%ivaaddr,%t2
-	ldo	R%ivaaddr(%t2),%t2
-	mtctl	%t2,%iva
+	ldil	L%ivaaddr, %t2
+	ldo	R%ivaaddr(%t2), %t2
+	mtctl	%t2, %iva
 
 	/*
 	 * set up the dp pointer so that we can do quick references off of it
 	 */
 	ldil	L%$global$,%dp
-	ldo	R%$global$(%dp),%dp
+	ldo	R%$global$(%dp), %dp
 
 	/*
 	 * Create a stack frame for us to call C with. Clear out the previous
@@ -413,7 +413,7 @@
 	mtctl	%r0, %pcsq
 	mtctl	%r0, %pcsq
 	mtctl	%rp, %pcoq
-	ldo	4(%rp),%rp
+	ldo	4(%rp), %rp
 	mtctl	%rp, %pcoq
 	mtctl	%arg1, %ipsw
 	rfi

CVS commit: src/sys/arch/hp700/include

2011-01-17 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Jan 17 12:42:41 UTC 2011

Modified Files:
src/sys/arch/hp700/include: cpu.h

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hp700/include/cpu.h

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

Modified files:

Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.55 src/sys/arch/hp700/include/cpu.h:1.56
--- src/sys/arch/hp700/include/cpu.h:1.55	Sun Dec 26 21:05:34 2010
+++ src/sys/arch/hp700/include/cpu.h	Mon Jan 17 12:42:41 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.55 2010/12/26 21:05:34 he Exp $	*/
+/*	$NetBSD: cpu.h,v 1.56 2011/01/17 12:42:41 skrll Exp $	*/
 
 /*	$OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $	*/
 
@@ -338,7 +338,7 @@
 void	hppa_ras(struct lwp *);
 int	spcopy(pa_space_t, const void *, pa_space_t, void *, size_t);
 int	spstrcpy(pa_space_t, const void *, pa_space_t, void *, size_t,
-		 size_t *);
+size_t *);
 int	copy_on_fault(void);
 void	lwp_trampoline(void);
 void	setfunc_trampoline(void);

CVS commit: [netbsd-5] src/sbin/newfs_ext2fs

2011-01-17 Thread Julian Coleman

Module Name:src
Committed By:   jdc
Date:   Mon Jan 17 12:45:00 UTC 2011

Modified Files:
src/sbin/newfs_ext2fs [netbsd-5]: extern.h

Log Message:
Add change :
sbin/newfs_ext2fs/extern.h: revision 1.3
required for ticket #1486.  Original commit message was:

Pull up following revision(s) (requested by tsutsui in ticket #1486):
sbin/fsck_ext2fs/setup.c: revision 1.26
sbin/newfs_ext2fs/mke2fs.c: revision 1.10
sbin/newfs_ext2fs/mke2fs.c: revision 1.11
sbin/newfs_ext2fs/mke2fs.c: revision 1.12
sbin/fsck_ext2fs/inode.c: revision 1.24
sys/lib/libsa/ext2fs.c: revision 1.6
sbin/newfs_ext2fs/extern.h: revision 1.3
sbin/fsck_ext2fs/inode.c: revision 1.25
sys/lib/libsa/ext2fs.c: revision 1.7
sbin/fsck_ext2fs/inode.c: revision 1.26
sys/ufs/ext2fs/ext2fs_inode.c: revision 1.68
sbin/fsck_ext2fs/inode.c: revision 1.27
sbin/fsck_ext2fs/inode.c: revision 1.28
sys/ufs/ext2fs/ext2fs_dinode.h: revision 1.18
sys/ufs/ext2fs/ext2fs_dinode.h: revision 1.19
sbin/newfs_ext2fs/newfs_ext2fs.c: revision 1.5
sbin/newfs_ext2fs/newfs_ext2fs.8: revision 1.2
sbin/newfs_ext2fs/newfs_ext2fs.c: revision 1.6
sbin/newfs_ext2fs/newfs_ext2fs.8: revision 1.3
sys/ufs/ext2fs/ext2fs_vfsops.c: revision 1.142
sbin/newfs_ext2fs/newfs_ext2fs.c: revision 1.7
sbin/newfs_ext2fs/newfs_ext2fs.8: revision 1.4
sbin/newfs_ext2fs/newfs_ext2fs.c: revision 1.8
PR/40936: Frederik Sausmikat: ext2fs: add support for inodes  128 bytes
Support variable inode sizes.
catch up with variable inode size.
Don't use e2fs_inode_size in superblock on E2FS_REV0 file system.
- accept only EXT2_REV0_DINODE_SIZE inodesize on -O 0
- use inodesize to get offset of inode, not struct ext2fs_dinode array
Replace a magic number with a new EXT2_REV0_DINODE_SIZE macro.
Use EXT2_DINODE_SIZE() to get offset of inode, not struct ext2fs_dinode array.
Fix botched logic in inodesize check.
Use inodesize to get offset of inode in one more place.
- add a sanity check for e2fs_inode_size in readsb()
- use EXT2_DINODE_SIZE() rather than sizeof(struct ext2fs_dinode) or
  struct ext2fs_dinode array/pointer to see e2fs_ipb and inode offsets
Sort options.
New sentence, new line.
Sort options in usage.
- unsigned - unsigned int
- remove unnecessary casts from malloc(3) and free(3)
- fix a bogus indent
Use size  INT32_MAX rather than size = 0x8000U to check 2GB limit.
Add missed byteswap ops against ext2fs_dinode members.
Handle 32 bit uid field on E2FS_REV1.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.12.1 src/sbin/newfs_ext2fs/extern.h

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

Modified files:

Index: src/sbin/newfs_ext2fs/extern.h
diff -u src/sbin/newfs_ext2fs/extern.h:1.2 src/sbin/newfs_ext2fs/extern.h:1.2.12.1
--- src/sbin/newfs_ext2fs/extern.h:1.2	Fri Dec 14 13:19:35 2007
+++ src/sbin/newfs_ext2fs/extern.h	Mon Jan 17 12:45:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.2 2007/12/14 13:19:35 tsutsui Exp $	*/
+/*	$NetBSD: extern.h,v 1.2.12.1 2011/01/17 12:45:00 jdc Exp $	*/
 
 /*
  * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
@@ -41,6 +41,7 @@
 extern int	Oflag;		/* format as an 4.3BSD file system */
 extern int	verbosity;	/* amount of printf() output */
 extern int64_t	fssize;		/* file system size */
+extern uint16_t	inodesize;	/* bytes per inode */
 extern uint	sectorsize;	/* sector size */
 extern uint	fsize;		/* fragment size */
 extern uint	bsize;		/* block size */

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

2011-01-17 Thread Julian Coleman

Module Name:src
Committed By:   jdc
Date:   Mon Jan 17 13:43:02 UTC 2011

Modified Files:
src/sys/arch/sparc/conf: GENERIC KRUPS MRCOFFEE TADPOLE3GX

Log Message:
Add (commented out) LOCKDEBUG and SYSCALL_DEBUG options.


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc/conf/TADPOLE3GX

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

Modified files:

Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.225 src/sys/arch/sparc/conf/GENERIC:1.226
--- src/sys/arch/sparc/conf/GENERIC:1.225	Tue Nov 23 11:14:06 2010
+++ src/sys/arch/sparc/conf/GENERIC	Mon Jan 17 13:43:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.225 2010/11/23 11:14:06 hannken Exp $
+# $NetBSD: GENERIC,v 1.226 2011/01/17 13:43:02 jdc Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.225 $
+#ident 		GENERIC-$Revision: 1.226 $
 
 maxusers	32
 
@@ -143,6 +143,8 @@
 ## Enable (possibly expensive) debugging code that may also display messages
 ## on the system console
 #options 	DEBUG
+#options 	LOCKDEBUG
+#options 	SYSCALL_DEBUG
 
 ## Make SCSI error messages more verbose when explaining their meanings.
 options 	SCSIVERBOSE

Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.53 src/sys/arch/sparc/conf/KRUPS:1.54
--- src/sys/arch/sparc/conf/KRUPS:1.53	Tue Nov 23 11:14:06 2010
+++ src/sys/arch/sparc/conf/KRUPS	Mon Jan 17 13:43:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.53 2010/11/23 11:14:06 hannken Exp $
+# $NetBSD: KRUPS,v 1.54 2011/01/17 13:43:02 jdc Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		KRUPS-$Revision: 1.53 $
+#ident 		KRUPS-$Revision: 1.54 $
 
 maxusers	32
 
@@ -148,6 +148,8 @@
 ## Enable (possibly expensive) debugging code that may also display messages
 ## on the system console
 #options 	DEBUG
+#options 	LOCKDEBUG
+#options 	SYSCALL_DEBUG
 
 options 	MIIVERBOSE	# verbose PHY autoconfig messages
 

Index: src/sys/arch/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.31 src/sys/arch/sparc/conf/MRCOFFEE:1.32
--- src/sys/arch/sparc/conf/MRCOFFEE:1.31	Sat Dec  5 20:11:17 2009
+++ src/sys/arch/sparc/conf/MRCOFFEE	Mon Jan 17 13:43:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.31 2009/12/05 20:11:17 pooka Exp $
+# $NetBSD: MRCOFFEE,v 1.32 2011/01/17 13:43:02 jdc Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		MRCOFFEE-$Revision: 1.31 $
+#ident 		MRCOFFEE-$Revision: 1.32 $
 
 maxusers	32
 
@@ -125,6 +125,8 @@
 ## Enable (possibly expensive) debugging code that may also display messages
 ## on the system console
 #options 	DEBUG
+#options 	LOCKDEBUG
+#options 	SYSCALL_DEBUG
 
 ## Make SCSI error messages more verbose when explaining their meanings.
 options 	SCSIVERBOSE

Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.51 src/sys/arch/sparc/conf/TADPOLE3GX:1.52
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.51	Tue Nov 23 11:14:06 2010
+++ src/sys/arch/sparc/conf/TADPOLE3GX	Mon Jan 17 13:43:02 2011
@@ -1,4 +1,4 @@
-# 	$NetBSD: TADPOLE3GX,v 1.51 2010/11/23 11:14:06 hannken Exp $
+# 	$NetBSD: TADPOLE3GX,v 1.52 2011/01/17 13:43:02 jdc Exp $
 
 include arch/sparc/conf/std.sparc
 
@@ -108,6 +108,8 @@
 ## Enable (possibly expensive) debugging code that may also display messages
 ## on the system console
 #options 	DEBUG
+#options 	LOCKDEBUG
+#options 	SYSCALL_DEBUG
 
 ## Make SCSI error messages more verbose when explaining their meanings.
 options 	SCSIVERBOSE

CVS commit: src/sys/arch

2011-01-17 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Mon Jan 17 14:36:34 UTC 2011

Modified Files:
src/sys/arch/atari/atari: trap.c
src/sys/arch/hp300/hp300: machdep.c
src/sys/arch/news68k/news68k: machdep.c
src/sys/arch/sun2/sun2: machdep.c trap.c
src/sys/arch/sun3/sun3: machdep.c trap.c
src/sys/arch/sun3/sun3x: machdep.c

Log Message:
Explicitly include machine/pcb.h for struct pcb.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/atari/atari/trap.c
cvs rdiff -u -r1.214 -r1.215 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sun2/sun2/machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sun2/sun2/trap.c
cvs rdiff -u -r1.198 -r1.199 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/sun3/sun3/trap.c
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/sun3/sun3x/machdep.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/atari/atari/trap.c
diff -u src/sys/arch/atari/atari/trap.c:1.109 src/sys/arch/atari/atari/trap.c:1.110
--- src/sys/arch/atari/atari/trap.c:1.109	Mon Dec 20 00:25:30 2010
+++ src/sys/arch/atari/atari/trap.c	Mon Jan 17 14:36:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.109 2010/12/20 00:25:30 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.110 2011/01/17 14:36:32 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.109 2010/12/20 00:25:30 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.110 2011/01/17 14:36:32 tsutsui Exp $);
 
 #include opt_ddb.h
 #include opt_execfmt.h
@@ -108,6 +108,7 @@
 #include machine/psl.h
 #include machine/trap.h
 #include machine/cpu.h
+#include machine/pcb.h
 #include machine/reg.h
 #include machine/pte.h
 #ifdef DDB

Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.214 src/sys/arch/hp300/hp300/machdep.c:1.215
--- src/sys/arch/hp300/hp300/machdep.c:1.214	Thu Jan  6 14:19:54 2011
+++ src/sys/arch/hp300/hp300/machdep.c	Mon Jan 17 14:36:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.214 2011/01/06 14:19:54 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.215 2011/01/17 14:36:33 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.214 2011/01/06 14:19:54 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.215 2011/01/17 14:36:33 tsutsui Exp $);
 
 #include opt_ddb.h
 #include opt_compat_netbsd.h
@@ -126,6 +126,7 @@
 #include machine/cpu.h
 #include machine/hp300spu.h
 #include machine/reg.h
+#include machine/pcb.h
 #include machine/psl.h
 #include machine/pte.h
 

Index: src/sys/arch/news68k/news68k/machdep.c
diff -u src/sys/arch/news68k/news68k/machdep.c:1.87 src/sys/arch/news68k/news68k/machdep.c:1.88
--- src/sys/arch/news68k/news68k/machdep.c:1.87	Mon Dec 20 00:25:40 2010
+++ src/sys/arch/news68k/news68k/machdep.c	Mon Jan 17 14:36:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.87 2010/12/20 00:25:40 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.88 2011/01/17 14:36:33 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.87 2010/12/20 00:25:40 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.88 2011/01/17 14:36:33 tsutsui Exp $);
 
 #include opt_ddb.h
 #include opt_compat_netbsd.h
@@ -115,6 +115,7 @@
 #include machine/autoconf.h
 #include machine/cpu.h
 #include machine/reg.h
+#include machine/pcb.h
 #include machine/pte.h
 #include machine/intr.h
 

Index: src/sys/arch/sun2/sun2/machdep.c
diff -u src/sys/arch/sun2/sun2/machdep.c:1.65 src/sys/arch/sun2/sun2/machdep.c:1.66
--- src/sys/arch/sun2/sun2/machdep.c:1.65	Mon Feb  8 19:02:32 2010
+++ src/sys/arch/sun2/sun2/machdep.c	Mon Jan 17 14:36:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.65 2010/02/08 19:02:32 joerg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.66 2011/01/17 14:36:33 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -153,7 +153,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.65 2010/02/08 19:02:32 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.66 2011/01/17 14:36:33 tsutsui Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -199,6 +199,7 @@
 #include machine/idprom.h
 #include machine/kcore.h
 #include machine/reg.h
+#include machine/pcb.h
 #include machine/psl.h
 #include machine/pte.h
 #define _SUN68K_BUS_DMA_PRIVATE

Index: src/sys/arch/sun2/sun2/trap.c
diff -u src/sys/arch/sun2/sun2/trap.c:1.41 src/sys/arch/sun2/sun2/trap.c:1.42
--- src/sys/arch/sun2/sun2/trap.c:1.41	Mon Dec 20 00:25:44 2010
+++ src/sys/arch/sun2/sun2/trap.c	Mon Jan 17 14:36:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v

CVS commit: src/sys/arch

2011-01-17 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Mon Jan 17 14:53:44 UTC 2011

Modified Files:
src/sys/arch/amiga/amiga: machdep.c
src/sys/arch/cesfic/cesfic: machdep.c trap.c
src/sys/arch/hp300/hp300: trap.c
src/sys/arch/luna68k/luna68k: machdep.c trap.c
src/sys/arch/mac68k/mac68k: machdep.c trap.c
src/sys/arch/mvme68k/mvme68k: trap.c
src/sys/arch/news68k/news68k: trap.c
src/sys/arch/next68k/next68k: machdep.c trap.c
src/sys/arch/x68k/x68k: machdep.c trap.c

Log Message:
Explicitly include machine/pcb.h for struct pcb.


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/sys/arch/amiga/amiga/machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/cesfic/cesfic/trap.c
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/hp300/hp300/trap.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/luna68k/luna68k/trap.c
cvs rdiff -u -r1.336 -r1.337 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/mac68k/mac68k/trap.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/mvme68k/mvme68k/trap.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/news68k/news68k/trap.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/next68k/next68k/machdep.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/next68k/next68k/trap.c
cvs rdiff -u -r1.170 -r1.171 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/x68k/x68k/trap.c

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

Modified files:

Index: src/sys/arch/amiga/amiga/machdep.c
diff -u src/sys/arch/amiga/amiga/machdep.c:1.228 src/sys/arch/amiga/amiga/machdep.c:1.229
--- src/sys/arch/amiga/amiga/machdep.c:1.228	Thu Jan 13 22:02:05 2011
+++ src/sys/arch/amiga/amiga/machdep.c	Mon Jan 17 14:53:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.228 2011/01/13 22:02:05 phx Exp $	*/
+/*	$NetBSD: machdep.c,v 1.229 2011/01/17 14:53:42 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -87,7 +87,7 @@
 #include opt_m68k_arch.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.228 2011/01/13 22:02:05 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.229 2011/01/17 14:53:42 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -131,6 +131,7 @@
 #include ddb/db_extern.h
 
 #include machine/reg.h
+#include machine/pcb.h
 #include machine/psl.h
 #include machine/pte.h
 #include machine/kcore.h

Index: src/sys/arch/cesfic/cesfic/machdep.c
diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.55 src/sys/arch/cesfic/cesfic/machdep.c:1.56
--- src/sys/arch/cesfic/cesfic/machdep.c:1.55	Sat Oct 16 17:10:43 2010
+++ src/sys/arch/cesfic/cesfic/machdep.c	Mon Jan 17 14:53:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.55 2010/10/16 17:10:43 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.56 2011/01/17 14:53:42 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.55 2010/10/16 17:10:43 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.56 2011/01/17 14:53:42 tsutsui Exp $);
 
 #include opt_bufcache.h
 #include opt_ddb.h
@@ -127,6 +127,7 @@
 #include machine/autoconf.h
 #include machine/cpu.h
 #include machine/reg.h
+#include machine/pcb.h
 #include machine/psl.h
 #include machine/pte.h
 

Index: src/sys/arch/cesfic/cesfic/trap.c
diff -u src/sys/arch/cesfic/cesfic/trap.c:1.53 src/sys/arch/cesfic/cesfic/trap.c:1.54
--- src/sys/arch/cesfic/cesfic/trap.c:1.53	Mon Dec 20 00:25:30 2010
+++ src/sys/arch/cesfic/cesfic/trap.c	Mon Jan 17 14:53:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.53 2010/12/20 00:25:30 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.54 2011/01/17 14:53:42 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.53 2010/12/20 00:25:30 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.54 2011/01/17 14:53:42 tsutsui Exp $);
 
 #include opt_ddb.h
 #include opt_execfmt.h
@@ -108,6 +108,7 @@
 #include m68k/cacheops.h
 
 #include machine/db_machdep.h
+#include machine/pcb.h
 #include machine/psl.h
 #include machine/trap.h
 #include machine/cpu.h

Index: src/sys/arch/hp300/hp300/trap.c
diff -u src/sys/arch/hp300/hp300/trap.c:1.145 src/sys/arch/hp300/hp300/trap.c:1.146
--- src/sys/arch/hp300/hp300/trap.c:1.145	Mon Dec 20 00:25:33 2010
+++ src/sys/arch/hp300/hp300/trap.c	Mon Jan 17 14:53:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.145 2010/12/20 00:25:33 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.146 2011/01/17 14:53:42 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.145 2010/12/20 00:25:33 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.146 2011/01/17

CVS commit: src/share/misc

2011-01-17 Thread John Nemeth

Module Name:src
Committed By:   jnemeth
Date:   Mon Jan 17 15:18:06 UTC 2011

Modified Files:
src/share/misc: acronyms

Log Message:
add TIL today I learned


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/share/misc/acronyms

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

Modified files:

Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.199 src/share/misc/acronyms:1.200
--- src/share/misc/acronyms:1.199	Thu Jan 13 15:41:52 2011
+++ src/share/misc/acronyms	Mon Jan 17 15:18:06 2011
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.199 2011/01/13 15:41:52 jruoho Exp $
+$NetBSD: acronyms,v 1.200 2011/01/17 15:18:06 jnemeth Exp $
 10Q	thank you
 10X	thanks
 1337	elite (leet)
@@ -344,6 +344,7 @@
 THX	thanks
 TIA	thanks in advance
 TIAVP	this is a volunteer project
+TIL	today I learned
 TINC	there is no cabal
 TLA	three letter acronym
 TLC	tender loving care

CVS commit: src/sys/arch/mips/mips

2011-01-17 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Mon Jan 17 15:32:59 UTC 2011

Modified Files:
src/sys/arch/mips/mips: trap.c

Log Message:
Explicitly include mips/pcb.h for struct pcb.


To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/arch/mips/mips/trap.c

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

Modified files:

Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.224 src/sys/arch/mips/mips/trap.c:1.225
--- src/sys/arch/mips/mips/trap.c:1.224	Mon Dec 20 00:25:38 2010
+++ src/sys/arch/mips/mips/trap.c	Mon Jan 17 15:32:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.224 2010/12/20 00:25:38 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.225 2011/01/17 15:32:59 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -78,7 +78,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.224 2010/12/20 00:25:38 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.225 2011/01/17 15:32:59 tsutsui Exp $);
 
 #include opt_cputype.h	/* which mips CPU levels do we support? */
 #include opt_ddb.h
@@ -108,6 +108,7 @@
 #include mips/trap.h
 #include mips/reg.h
 #include mips/regnum.h			/* symbolic register indices */
+#include mips/pcb.h
 #include mips/pte.h
 #include mips/psl.h
 #include mips/userret.h

CVS commit: src/sys/dev/acpi

2011-01-17 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 17 15:49:13 UTC 2011

Modified Files:
src/sys/dev/acpi: acpi.c acpivar.h files.acpi
Added Files:
src/sys/dev/acpi: acpi_wdrt.c

Log Message:
Add a driver for ACPI Watchdog Resource Table devices.

  acpiwdrt0 at acpi0: mem 0xfed01000,0xfed01004
  acpiwdrt0: PCI 0:000:00:0 vendor 0x1106 product 0x3337
  acpiwdrt0: watchdog interval 1-1023 sec.


To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/acpi_wdrt.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/acpi/acpivar.h
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/acpi/files.acpi

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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.233 src/sys/dev/acpi/acpi.c:1.234
--- src/sys/dev/acpi/acpi.c:1.233	Thu Jan 13 05:58:05 2011
+++ src/sys/dev/acpi/acpi.c	Mon Jan 17 15:49:13 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.233 2011/01/13 05:58:05 jruoho Exp $	*/
+/*	$NetBSD: acpi.c,v 1.234 2011/01/17 15:49:13 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.233 2011/01/13 05:58:05 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.234 2011/01/17 15:49:13 jmcneill Exp $);
 
 #include opt_acpi.h
 #include opt_pcifixup.h
@@ -613,6 +613,8 @@
 
 	if (sc-sc_apmbus == child)
 		sc-sc_apmbus = NULL;
+	if (sc-sc_wdrt == child)	
+		sc-sc_wdrt = NULL;
 
 	SIMPLEQ_FOREACH(ad, sc-ad_head, ad_list) {
 
@@ -806,6 +808,10 @@
 		sc-sc_apmbus = config_found_ia(sc-sc_dev,
 		acpiapmbus, NULL, NULL);
 
+	if (ifattr_match(ifattr, acpiwdrtbus)  sc-sc_wdrt == NULL)
+		sc-sc_wdrt = config_found_ia(sc-sc_dev,
+		acpiwdrtbus, NULL, NULL);
+
 	return 0;
 }
 

Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.66 src/sys/dev/acpi/acpivar.h:1.67
--- src/sys/dev/acpi/acpivar.h:1.66	Thu Jan 13 05:14:48 2011
+++ src/sys/dev/acpi/acpivar.h	Mon Jan 17 15:49:13 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpivar.h,v 1.66 2011/01/13 05:14:48 jruoho Exp $	*/
+/*	$NetBSD: acpivar.h,v 1.67 2011/01/17 15:49:13 jmcneill Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -149,6 +149,8 @@
 	device_t		 sc_dev;	/* base device info */
 	device_t		 sc_apmbus;	/* APM pseudo-bus */
 
+	device_t		 sc_wdrt;	/* WDRT watchdog */
+
 	struct acpi_devnode	*sc_root;	/* root of the device tree */
 
 	bus_space_tag_t		 sc_iot;	/* PCI I/O space tag */

Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.84 src/sys/dev/acpi/files.acpi:1.85
--- src/sys/dev/acpi/files.acpi:1.84	Sun Jan  9 15:12:34 2011
+++ src/sys/dev/acpi/files.acpi	Mon Jan 17 15:49:13 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.acpi,v 1.84 2011/01/09 15:12:34 jruoho Exp $
+#	$NetBSD: files.acpi,v 1.85 2011/01/17 15:49:13 jmcneill Exp $
 
 include dev/acpi/acpica/files.acpica
 
@@ -10,8 +10,9 @@
 define	acpiapmbus { }
 define	acpinodebus { }
 define	acpiecdtbus { }
+define	acpiwdrtbus { }
 
-device	acpi: acpica, acpiapmbus, acpinodebus, acpiecdtbus, sysmon_power, sysmon_taskq
+device	acpi: acpica, acpiapmbus, acpinodebus, acpiecdtbus, acpiwdrtbus, sysmon_power, sysmon_taskq
 attach	acpi at acpibus
 file	dev/acpi/acpi.c			acpi
 file	dev/acpi/acpi_debug.c		acpi
@@ -88,6 +89,11 @@
 attach	acpitz at acpinodebus
 file	dev/acpi/acpi_tz.c		acpitz
 
+# ACPI Watchdog Timer
+device	acpiwdrt
+attach	acpiwdrt at acpiwdrtbus
+file	dev/acpi/acpi_wdrt.c		acpiwdrt
+
 # Serial interface
 attach	com at acpinodebus with com_acpi
 file	dev/acpi/com_acpi.c		com_acpi

Added files:

Index: src/sys/dev/acpi/acpi_wdrt.c
diff -u /dev/null src/sys/dev/acpi/acpi_wdrt.c:1.1
--- /dev/null	Mon Jan 17 15:49:13 2011
+++ src/sys/dev/acpi/acpi_wdrt.c	Mon Jan 17 15:49:13 2011
@@ -0,0 +1,434 @@
+/* $NetBSD: acpi_wdrt.c,v 1.1 2011/01/17 15:49:13 jmcneill Exp $ */
+
+/*
+ * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
+ * 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. The name of the author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR 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,

CVS commit: src/sys/modules/acpiwdrt

2011-01-17 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 17 15:49:56 UTC 2011

Added Files:
src/sys/modules/acpiwdrt: Makefile acpiwdrt.ioconf

Log Message:
add acpiwdrt module glue


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/acpiwdrt/Makefile \
src/sys/modules/acpiwdrt/acpiwdrt.ioconf

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

Added files:

Index: src/sys/modules/acpiwdrt/Makefile
diff -u /dev/null src/sys/modules/acpiwdrt/Makefile:1.1
--- /dev/null	Mon Jan 17 15:49:56 2011
+++ src/sys/modules/acpiwdrt/Makefile	Mon Jan 17 15:49:56 2011
@@ -0,0 +1,13 @@
+#	$NetBSD: Makefile,v 1.1 2011/01/17 15:49:56 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH:	${S}/dev/acpi
+
+KMOD=	acpiwdrt
+IOCONF=	acpiwdrt.ioconf
+SRCS=	acpi_wdrt.c
+
+WARNS=	4
+
+.include bsd.kmodule.mk
Index: src/sys/modules/acpiwdrt/acpiwdrt.ioconf
diff -u /dev/null src/sys/modules/acpiwdrt/acpiwdrt.ioconf:1.1
--- /dev/null	Mon Jan 17 15:49:56 2011
+++ src/sys/modules/acpiwdrt/acpiwdrt.ioconf	Mon Jan 17 15:49:56 2011
@@ -0,0 +1,10 @@
+#	$NetBSD: acpiwdrt.ioconf,v 1.1 2011/01/17 15:49:56 jmcneill Exp $
+
+ioconf acpiwdrt
+
+include conf/files
+include dev/acpi/files.acpi
+
+pseudo-root acpi*
+
+acpiwdrt* at acpiwdrtbus?

CVS commit: src/sys/dev/acpi

2011-01-17 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 17 15:55:24 UTC 2011

Modified Files:
src/sys/dev/acpi: files.acpi

Log Message:
acpiwdrt needs sysmon_wdog


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/acpi/files.acpi

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/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.85 src/sys/dev/acpi/files.acpi:1.86
--- src/sys/dev/acpi/files.acpi:1.85	Mon Jan 17 15:49:13 2011
+++ src/sys/dev/acpi/files.acpi	Mon Jan 17 15:55:24 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.acpi,v 1.85 2011/01/17 15:49:13 jmcneill Exp $
+#	$NetBSD: files.acpi,v 1.86 2011/01/17 15:55:24 jmcneill Exp $
 
 include dev/acpi/acpica/files.acpica
 
@@ -90,7 +90,7 @@
 file	dev/acpi/acpi_tz.c		acpitz
 
 # ACPI Watchdog Timer
-device	acpiwdrt
+device	acpiwdrt: sysmon_wdog
 attach	acpiwdrt at acpiwdrtbus
 file	dev/acpi/acpi_wdrt.c		acpiwdrt

CVS commit: src/sys/arch

2011-01-17 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 17 15:56:04 UTC 2011

Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC

Log Message:
add acpiwdrt


To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.284 -r1.285 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1006 -r1.1007 src/sys/arch/i386/conf/GENERIC

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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.298 src/sys/arch/amd64/conf/GENERIC:1.299
--- src/sys/arch/amd64/conf/GENERIC:1.298	Sun Jan  9 15:12:33 2011
+++ src/sys/arch/amd64/conf/GENERIC	Mon Jan 17 15:56:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.298 2011/01/09 15:12:33 jruoho Exp $
+# $NetBSD: GENERIC,v 1.299 2011/01/17 15:56:03 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.298 $
+#ident 		GENERIC-$Revision: 1.299 $
 
 maxusers	64		# estimated number of users
 
@@ -285,6 +285,7 @@
 acpitz* 	at acpi?		# ACPI Thermal Zone
 acpivga*	at acpi?		# ACPI Display Adapter
 acpiout*	at acpivga?		# ACPI Display Output Device
+acpiwdrt*	at acpi?		# ACPI Watchdog Resource Table
 acpiwmi*	at acpi?		# ACPI WMI Mapper
 
 # Mainboard devices

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.284 src/sys/arch/i386/conf/ALL:1.285
--- src/sys/arch/i386/conf/ALL:1.284	Sun Jan  9 15:12:33 2011
+++ src/sys/arch/i386/conf/ALL	Mon Jan 17 15:56:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.284 2011/01/09 15:12:33 jruoho Exp $
+# $NetBSD: ALL,v 1.285 2011/01/17 15:56:03 jmcneill Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		ALL-$Revision: 1.284 $
+#ident 		ALL-$Revision: 1.285 $
 
 maxusers	64		# estimated number of users
 
@@ -376,6 +376,7 @@
 acpitz* 	at acpi?		# ACPI Thermal Zone
 acpivga*	at acpi?		# ACPI Display Adapter
 acpiout*	at acpivga?		# ACPI Display Output Device
+acpiwdrt*	at acpi?		# ACPI Watchdog Resource Table
 acpiwmi*	at acpi?		# ACPI WMI Mapper
 
 # Mainboard devices

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1006 src/sys/arch/i386/conf/GENERIC:1.1007
--- src/sys/arch/i386/conf/GENERIC:1.1006	Sun Jan  9 15:12:33 2011
+++ src/sys/arch/i386/conf/GENERIC	Mon Jan 17 15:56:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1006 2011/01/09 15:12:33 jruoho Exp $
+# $NetBSD: GENERIC,v 1.1007 2011/01/17 15:56:03 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.1006 $
+#ident 		GENERIC-$Revision: 1.1007 $
 
 maxusers	64		# estimated number of users
 
@@ -365,6 +365,7 @@
 acpitz* 	at acpi?		# ACPI Thermal Zone
 acpivga*	at acpi?		# ACPI Display Adapter
 acpiout*	at acpivga?		# ACPI Display Output Device
+acpiwdrt*	at acpi?		# ACPI Watchdog Resource Table
 acpiwmi*	at acpi?		# ACPI WMI Mapper
 
 # Mainboard devices

CVS commit: src/sys

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 15:57:04 UTC 2011

Modified Files:
src/sys/compat/common: Makefile kern_time_50.c
src/sys/modules/compat: Makefile
Added Files:
src/sys/compat/common: kern_select_50.c

Log Message:
Put async i/o compat routines in a separate source module from the
ones related to clock and process management.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/compat/common/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/compat/common/kern_select_50.c
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/common/kern_time_50.c
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/compat/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/compat/common/Makefile
diff -u src/sys/compat/common/Makefile:1.45 src/sys/compat/common/Makefile:1.46
--- src/sys/compat/common/Makefile:1.45	Mon Jan 19 19:39:41 2009
+++ src/sys/compat/common/Makefile	Mon Jan 17 15:57:04 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.45 2009/01/19 19:39:41 christos Exp $
+#	$NetBSD: Makefile,v 1.46 2011/01/17 15:57:04 pooka Exp $
 
 LIB=		compat
 NOPIC=		# defined
@@ -40,8 +40,9 @@
 SRCS+=	vfs_syscalls_40.c uipc_syscalls_40.c
 
 # Compatibility code for NetBSD 5.0
-SRCS+=	kern_time_50.c rtsock_50.c sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c \
-	vfs_syscalls_50.c  uipc_syscalls_50.c sysv_ipc_50.c
+SRCS+=	kern_time_50.c kern_select_50.c rtsock_50.c sysv_msg_50.c \
+	sysv_sem_50.c sysv_shm_50.c vfs_syscalls_50.c  uipc_syscalls_50.c \
+	sysv_ipc_50.c
 
 # really, all machines where sizeof(int) != sizeof(long) (LP64)
 .if (${MACHINE_ARCH} != alpha  ${MACHINE_ARCH} != sparc64 \

Index: src/sys/compat/common/kern_time_50.c
diff -u src/sys/compat/common/kern_time_50.c:1.16 src/sys/compat/common/kern_time_50.c:1.17
--- src/sys/compat/common/kern_time_50.c:1.16	Sun May 30 19:31:39 2010
+++ src/sys/compat/common/kern_time_50.c	Mon Jan 17 15:57:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_time_50.c,v 1.16 2010/05/30 19:31:39 drochner Exp $	*/
+/*	$NetBSD: kern_time_50.c,v 1.17 2011/01/17 15:57:04 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_time_50.c,v 1.16 2010/05/30 19:31:39 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_time_50.c,v 1.17 2011/01/17 15:57:04 pooka Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_aio.h
@@ -65,46 +65,6 @@
 #include compat/sys/resource.h
 #include compat/sys/clockctl.h
 
-static int
-compat_50_kevent_fetch_timeout(const void *src, void *dest, size_t length)
-{
-	struct timespec50 ts50;
-	int error;
-
-	KASSERT(length == sizeof(struct timespec));
-
-	error = copyin(src, ts50, sizeof(ts50));
-	if (error)
-		return error;
-	timespec50_to_timespec(ts50, (struct timespec *)dest);
-	return 0;
-}
-
-int
-compat_50_sys_kevent(struct lwp *l, const struct compat_50_sys_kevent_args *uap,
-register_t *retval)
-{
-	/* {
-		syscallarg(int) fd;
-		syscallarg(keventp_t) changelist;
-		syscallarg(size_t) nchanges;
-		syscallarg(keventp_t) eventlist;
-		syscallarg(size_t) nevents;
-		syscallarg(struct timespec50) timeout;
-	} */
-	static const struct kevent_ops compat_50_kevent_ops = {
-		.keo_private = NULL,
-		.keo_fetch_timeout = compat_50_kevent_fetch_timeout,
-		.keo_fetch_changes = kevent_fetch_changes,
-		.keo_put_events = kevent_put_events,
-	};
-
-	return kevent1(retval, SCARG(uap, fd), SCARG(uap, changelist),
-	SCARG(uap, nchanges), SCARG(uap, eventlist), SCARG(uap, nevents),
-	(const struct timespec *)(const void *)SCARG(uap, timeout),
-	compat_50_kevent_ops);
-}
-
 int
 compat_50_sys_clock_gettime(struct lwp *l,
 const struct compat_50_sys_clock_gettime_args *uap, register_t *retval)
@@ -384,100 +344,6 @@
 }
 
 int
-compat_50_sys_select(struct lwp *l,
-const struct compat_50_sys_select_args *uap, register_t *retval)
-{
-	/* {
-		syscallarg(int)			nd;
-		syscallarg(fd_set *)		in;
-		syscallarg(fd_set *)		ou;
-		syscallarg(fd_set *)		ex;
-		syscallarg(struct timeval50 *)	tv;
-	} */
-	struct timespec ats, *ts = NULL;
-	struct timeval50 atv50;
-	int error;
-
-	if (SCARG(uap, tv)) {
-		error = copyin(SCARG(uap, tv), (void *)atv50, sizeof(atv50));
-		if (error)
-			return error;
-		ats.tv_sec = atv50.tv_sec;
-		ats.tv_nsec = atv50.tv_usec * 1000;
-		ts = ats;
-	}
-
-	return selcommon(retval, SCARG(uap, nd), SCARG(uap, in),
-	SCARG(uap, ou), SCARG(uap, ex), ts, NULL);
-}
-
-int
-compat_50_sys_pselect(struct lwp *l,
-const struct compat_50_sys_pselect_args *uap, register_t *retval)
-{
-	/* {
-		syscallarg(int)nd;
-		syscallarg(fd_set *)			in;
-		syscallarg(fd_set *)			ou;
-		syscallarg(fd_set *)			ex;
-		syscallarg(const struct timespec50 *)	ts;
-		syscallarg(sigset_t *)			mask;
-	} */
-	struct timespec50	ats50;
-	struct timespec	ats, *ts = NULL;
-	sigset_t	amask, *mask = NULL;
-	int		error;
-
-	if

CVS commit: src

2011-01-17 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 17 16:08:20 UTC 2011

Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
Added Files:
src/share/man/man4: acpiwdrt.4

Log Message:
add acpiwdrt(4) man page


To generate a diff of this commit:
cvs rdiff -u -r1.1277 -r1.1278 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.543 -r1.544 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man4/acpiwdrt.4

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.1277 src/distrib/sets/lists/man/mi:1.1278
--- src/distrib/sets/lists/man/mi:1.1277	Fri Jan 14 10:25:14 2011
+++ src/distrib/sets/lists/man/mi	Mon Jan 17 16:08:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1277 2011/01/14 10:25:14 phx Exp $
+# $NetBSD: mi,v 1.1278 2011/01/17 16:08:19 jmcneill Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -643,6 +643,7 @@
 ./usr/share/man/cat4/acpismbus.0		man-sys-catman		.cat
 ./usr/share/man/cat4/acpitz.0			man-sys-catman		.cat
 ./usr/share/man/cat4/acpivga.0			man-sys-catman		.cat
+./usr/share/man/cat4/acpiwdrt.0			man-sys-catman		.cat
 ./usr/share/man/cat4/acpiwmi.0			man-sys-catman		.cat
 ./usr/share/man/cat4/adb.0			man-sys-catman		.cat
 ./usr/share/man/cat4/adbbt.0			man-sys-catman		.cat
@@ -3419,6 +3420,7 @@
 ./usr/share/man/html4/acpismbus.html		man-sys-htmlman		html
 ./usr/share/man/html4/acpitz.html		man-sys-htmlman		html
 ./usr/share/man/html4/acpivga.html		man-sys-htmlman		html
+./usr/share/man/html4/acpiwdrt.html		man-sys-htmlman		html
 ./usr/share/man/html4/acpiwmi.html		man-sys-htmlman		html
 ./usr/share/man/html4/adb.html			man-sys-htmlman		html
 ./usr/share/man/html4/adbbt.html		man-sys-htmlman		html
@@ -5895,6 +5897,7 @@
 ./usr/share/man/man4/acpismbus.4		man-sys-man		.man
 ./usr/share/man/man4/acpitz.4			man-sys-man		.man
 ./usr/share/man/man4/acpivga.4			man-sys-man		.man
+./usr/share/man/man4/acpiwdrt.4			man-sys-man		.man
 ./usr/share/man/man4/acpiwmi.4			man-sys-man		.man
 ./usr/share/man/man4/adb.4			man-sys-man		.man
 ./usr/share/man/man4/adbbt.4			man-sys-man		.man

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.543 src/share/man/man4/Makefile:1.544
--- src/share/man/man4/Makefile:1.543	Tue Jan 11 00:45:04 2011
+++ src/share/man/man4/Makefile	Mon Jan 17 16:08:20 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.543 2011/01/11 00:45:04 jym Exp $
+#	$NetBSD: Makefile,v 1.544 2011/01/17 16:08:20 jmcneill Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -83,7 +83,7 @@
 # ACPI devices
 MAN+=	acpi.4 acpiacad.4 acpibat.4 acpibut.4 acpicpu.4 \
 	acpidalb.4 acpiec.4 acpifan.4 acpilid.4 \
-	acpipmtr.4 acpismbus.4 acpitz.4 acpivga.4 acpiwmi.4
+	acpipmtr.4 acpismbus.4 acpitz.4 acpivga.4 acpiwdrt.4 acpiwmi.4
 
 # Radio devices
 MAN+=	radio.4 az.4 mr.4 rt.4 rtii.4 sf2r.4

Added files:

Index: src/share/man/man4/acpiwdrt.4
diff -u /dev/null src/share/man/man4/acpiwdrt.4:1.1
--- /dev/null	Mon Jan 17 16:08:20 2011
+++ src/share/man/man4/acpiwdrt.4	Mon Jan 17 16:08:20 2011
@@ -0,0 +1,54 @@
+.\	$NetBSD: acpiwdrt.4,v 1.1 2011/01/17 16:08:20 jmcneill Exp $
+.\
+.\ Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
+.\ 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. Neither the name of the author nor the names of any
+.\contributors may be used to endorse or promote products derived
+.\from this software without specific prior written permission.
+.\
+.\ 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 FOUNDATION OR CONTRIBUTORS
+.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\ POSSIBILITY OF SUCH DAMAGE.
+.\
+.Dd January 17, 2011
+.Dt ACPIWDRT 4
+.Os
+.Sh NAME
+.Nm acpiwdrt
+.Nd ACPI Watchdog Resource Table device driver
+.Sh SYNOPSIS
+.Cd acpiwdrt* at acpi?
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for watchdog timers specified in
+.Tn ACPI
+WDRT tables.
+The
+.Nm

CVS commit: src/sbin/wdogctl

2011-01-17 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 17 16:09:48 UTC 2011

Modified Files:
src/sbin/wdogctl: wdogctl.8

Log Message:
Xr acpiwdrt(4)


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sbin/wdogctl/wdogctl.8

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

Modified files:

Index: src/sbin/wdogctl/wdogctl.8
diff -u src/sbin/wdogctl/wdogctl.8:1.20 src/sbin/wdogctl/wdogctl.8:1.21
--- src/sbin/wdogctl/wdogctl.8:1.20	Thu Dec 23 14:29:52 2010
+++ src/sbin/wdogctl/wdogctl.8	Mon Jan 17 16:09:48 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: wdogctl.8,v 1.20 2010/12/23 14:29:52 hauke Exp $
+.\	$NetBSD: wdogctl.8,v 1.21 2011/01/17 16:09:48 jmcneill Exp $
 .\
 .\ Copyright (c) 2000 Zembu Labs, Inc.
 .\ All rights reserved.
@@ -31,7 +31,7 @@
 .\ (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 January 9, 2008
+.Dd January 17, 2011
 .Dt WDOGCTL 8
 .Os
 .Sh NAME
@@ -162,6 +162,7 @@
 .Pa /dev/watchdog
 -- the system monitor watchdog timer device
 .Sh SEE ALSO
+.Xr acpiwdrt 4 ,
 .Xr evbarm/iopwdog 4 ,
 .Xr i386/elansc 4 ,
 .Xr i386/gcscpcib 4 ,

CVS commit: src/doc

2011-01-17 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 17 16:13:39 UTC 2011

Modified Files:
src/doc: CHANGES

Log Message:
note acpiwdrt(4) addition


To generate a diff of this commit:
cvs rdiff -u -r1.1491 -r1.1492 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.1491 src/doc/CHANGES:1.1492
--- src/doc/CHANGES:1.1491	Mon Jan 17 07:33:16 2011
+++ src/doc/CHANGES	Mon Jan 17 16:13:39 2011
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1491 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1492 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -827,3 +827,5 @@
 	powerpc: Add support for using secure PLT (thereby allowing data
 		and bss of powerpc programs and shared library to be set
 		non-executable). [matt 20110115]
+	acpiwdrt(4): Add a driver for ACPI Watchdog Resource Tables.
+		[jmcneill 20110117]

CVS commit: src/sys/kern

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 16:16:54 UTC 2011

Modified Files:
src/sys/kern: makesyscalls.sh

Log Message:
Rework how syscall compat is handled for rump syscalls.  The old
one had the problem of bypassing the syscall layer and doing a
function call into the kernel directly.  Therefore there was no
way for users of librumpclient to specify compat.  The new model
pushes the compat handling in the kernel and leaves only the task
of selecting the right syscall number to the client.

This change also introduces a stable ABI for rump syscalls, i.e.
it is possible to use the same syscall client library both on NetBSD
5.0 and -current and get the syscalls resolved to the right place
depending on the ABI at the time the client binary is compiled.

A list of what to be called when will have to maintained separately
simply because this information is not available in syscalls.master
-- in the case of the normal kernel we always want to resolve a
newly linked syscall to the latest version, whereas in rump we
might want to resolve a syscall to a -current kernel to the 5.0
compat call (because our client namespace is 5.0).  This information
in maintained in rump_syscalls_compat.h with the current format:

/* time_t change */
#if !__NetBSD_Prereq__(5,99,7)
#define RUMP_SYS_RENAME_STAT rump___sysimpl_stat30


If no compat override is given, a syscall resolves automatically
to the latest version of the syscall.

Also, this change autogenerates forward declarations for all syscall
types where it is possible (i.e. ones without typedef insanity).
This makes it possible to include rump_syscalls.h without including
rump.h.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/kern/makesyscalls.sh

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/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.108 src/sys/kern/makesyscalls.sh:1.109
--- src/sys/kern/makesyscalls.sh:1.108	Thu Dec 30 20:09:53 2010
+++ src/sys/kern/makesyscalls.sh	Mon Jan 17 16:16:54 2011
@@ -1,5 +1,5 @@
 #! /bin/sh -
-#	$NetBSD: makesyscalls.sh,v 1.108 2010/12/30 20:09:53 pooka Exp $
+#	$NetBSD: makesyscalls.sh,v 1.109 2011/01/17 16:16:54 pooka Exp $
 #
 # Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
 # All rights reserved.
@@ -73,8 +73,10 @@
 syscompat_pref=sysent.
 sysent=sysent.switch
 sysnamesbottom=sysnames.bottom
+rumptypes=rumphdr.types
+rumpprotos=rumphdr.protos
 
-trap rm $sysdcl $sysprotos $sysent $sysnamesbottom $rumpsysent 0
+trap rm $sysdcl $sysprotos $sysent $sysnamesbottom $rumpsysent $rumptypes $rumpprotos 0
 
 # Awk program (must support nawk extensions)
 # Use awk at Berkeley, nawk or gawk elsewhere.
@@ -152,6 +154,8 @@
 	syscompat_pref = \$syscompat_pref\
 	sysent = \$sysent\
 	sysnamesbottom = \$sysnamesbottom\
+	rumpprotos = \$rumpprotos\
+	rumptypes = \$rumptypes\
 	sys_nosys = \$sys_nosys\
 	maxsysargs = \$maxsysargs\
 	infile = \$2\
@@ -276,9 +280,10 @@
 	printf #ifdef _KERNEL\n  rumpcallshdr
 	printf #error Interface not supported inside kernel\n  rumpcallshdr
 	printf #endif /* _KERNEL */\n\n  rumpcallshdr
-	printf #include sys/types.h\n  rumpcallshdr
-	printf #include sys/select.h\n\n  rumpcallshdr
-	printf #include signal.h\n\n  rumpcallshdr
+	printf #include sys/types.h /* typedefs */\n  rumpcallshdr
+	printf #include sys/select.h /* typedefs */\n\n  rumpcallshdr
+	printf #include signal.h /* typedefs */\n\n  rumpcallshdr
+	printf #include rump/rump_syscalls_compat.h\n\n  rumpcallshdr
 
 	printf %s, sysarghdrextra  sysarghdr
 	# Write max number of system call arguments to both headers
@@ -308,6 +313,14 @@
 		[sizeof (struct call##_args) \\\n \
 		\t\t= %sMAXSYSARGS * sizeof (%s) ? 1 : -1];\n, \
 		constprefix, registertype) sysarghdr
+
+	# compat types from syscalls.master.  this is slightly ugly,
+	# but given that we have so few compats from over 17 years,
+	# a more complicated solution is not currently warranted.
+	uncompattypes[struct timeval50] = struct timeval;
+	uncompattypes[struct timespec50] = struct timespec;
+	uncompattypes[struct stat30] = struct stat;
+
 	next
 }
 NF == 0 || $1 ~ /^;/ {
@@ -459,13 +472,10 @@
 		rumphaspipe = 1;
 	}
 
-	funcstdname=fprefix _ fbase
 	if (fcompat != ) {
 		funcname=fprefix ___ fbase  fcompat
-		wantrename=1
 	} else {
-		funcname=funcstdname
-		wantrename=0
+		funcname=fprefix _ fbase
 	}
 	if (returntype == quad_t || returntype == off_t) {
 		if (sycall_flags == 0)
@@ -477,7 +487,11 @@
 	if (funcalias == ) {
 		funcalias=funcname
 		sub(/^([^_]+_)*sys_/, , funcalias)
+		realname=fbase
+	} else {
+		realname=funcalias
 	}
+	rumpfname=realname  fcompat
 	f++
 
 	if ($f != ()
@@ -571,20 +585,39 @@
 	if (!rumpable)
 		return
 
-	if (wantrename)
-		printf(%s rump_%s(, returntype, funcstdname)  rumpcallshdr
-	else
-		printf(%s rump_sys_%s(, returntype, funcalias)  rumpcallshdr
+	# accumulate fbases we

CVS commit: src/sys/rump/librump

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 16:20:20 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
src/sys/rump/librump/rumpvfs: compat.c
Removed Files:
src/sys/rump/librump/rumpkern: compat.c

Log Message:
use compat code from sys/compat/common


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpkern/compat.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpvfs/compat.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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.106 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.107
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.106	Thu Jan  6 11:22:55 2011
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern	Mon Jan 17 16:20:20 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpkern,v 1.106 2011/01/06 11:22:55 pooka Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.107 2011/01/17 16:20:20 pooka Exp $
 #
 
 .include ${RUMPTOP}/Makefile.rump
@@ -10,7 +10,8 @@
 	${RUMPTOP}/../uvm	\
 	${RUMPTOP}/../conf	\
 	${RUMPTOP}/../dev	\
-	${RUMPTOP}/../secmodel/suser
+	${RUMPTOP}/../secmodel/suser\
+	${RUMPTOP}/../compat/common
 
 #
 # Source modules, first the ones specifically implemented for librump.
@@ -18,7 +19,6 @@
 SRCS=	rump.c rumpcopy.c emul.c intr.c lwproc.c klock.c	\
 	kobj_rename.c ltsleep.c memalloc.c scheduler.c		\
 	signals.c sleepq.c threads.c vm.c
-SRCS+=	compat.c
 
 # Multiprocessor or uniprocessor locking.  TODO: select right
 # locking at runtime.
@@ -117,6 +117,9 @@
 # sys/dev
 SRCS+=	clock_subr.c
 
+# compat
+SRCS+=	kern_select_50.c
+
 # Flip the comment to the other line if you want to use malloc(3)
 # directly instead of the kernel allocators backed by malloc(3)/mmap(2).
 # Libc malloc is a few percent faster, but doesn't emulate all kernel

Index: src/sys/rump/librump/rumpvfs/compat.c
diff -u src/sys/rump/librump/rumpvfs/compat.c:1.8 src/sys/rump/librump/rumpvfs/compat.c:1.9
--- src/sys/rump/librump/rumpvfs/compat.c:1.8	Tue Jan  4 17:00:19 2011
+++ src/sys/rump/librump/rumpvfs/compat.c	Mon Jan 17 16:20:20 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat.c,v 1.8 2011/01/04 17:00:19 pooka Exp $	*/
+/*	$NetBSD: compat.c,v 1.9 2011/01/17 16:20:20 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: compat.c,v 1.8 2011/01/04 17:00:19 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: compat.c,v 1.9 2011/01/17 16:20:20 pooka Exp $);
 
 #include sys/param.h
 #include sys/kmem.h
@@ -80,126 +80,6 @@
 	long		va_spare;	/* remain quad aligned */
 };
 
-int
-rump_sys_nb5_stat(const char *path, struct stat *sb)
-{
-	struct compat_50_sys___stat30_args args;
-	register_t retval = 0;
-	int error = 0;
-
-	SPARG(args, path) = path;
-	SPARG(args, ub) = (struct stat30 *)sb;
-
-	rump_schedule();
-	error = compat_50_sys___stat30(curlwp, args, retval);
-	if (error) {
-		retval = -1;
-		rumpuser_seterrno(error);
-	}
-	rump_unschedule();
-	return retval;
-}
-
-int
-rump_sys_nb5_lstat(const char *path, struct stat *sb)
-{
-	struct compat_50_sys___lstat30_args args;
-	register_t retval = 0;
-	int error = 0;
-
-	SPARG(args, path) = path;
-	SPARG(args, ub) = (struct stat30 *)sb;
-
-	rump_schedule();
-	error = compat_50_sys___lstat30(curlwp, args, retval);
-	if (error) {
-		retval = -1;
-		rumpuser_seterrno(error);
-	}
-	rump_unschedule();
-	return retval;
-}
-
-int
-rump_sys_nb5_fstat(int fd, struct stat *sb)
-{
-	struct compat_50_sys___fstat30_args args;
-	register_t retval = 0;
-	int error = 0;
-
-	SPARG(args, fd) = fd;
-	SPARG(args, sb) = (struct stat30 *)sb;
-
-	rump_schedule();
-	error = compat_50_sys___fstat30(curlwp, args, retval);
-	if (error) {
-		retval = -1;
-		rumpuser_seterrno(error);
-	}
-	rump_unschedule();
-	return retval;
-}
-
-int
-rump_sys_nb5_utimes(const char *path, const struct timeval times[2])
-{
-	struct compat_50_sys_utimes_args args;
-	register_t retval = 0;
-	int error = 0;
-
-	SPARG(args, path) = path;
-	SPARG(args, tptr) = (const struct timeval50 *)times;
-
-	rump_schedule();
-	error = compat_50_sys_utimes(curlwp, args, retval);
-	if (error) {
-		retval = -1;
-		rumpuser_seterrno(error);
-	}
-	rump_unschedule();
-	return retval;
-}
-
-int
-rump_sys_nb5_lutimes(const char *path, const struct timeval times[2])
-{
-	struct compat_50_sys_lutimes_args args;
-	register_t retval = 0;
-	int error = 0;
-
-	SPARG(args, path) = path;
-	SPARG(args, tptr) = (const struct timeval50 *)times;
-
-	rump_schedule();
-	error = compat_50_sys_lutimes(curlwp, args, retval);
-	if (error) {
-		retval = -1;
-		rumpuser_seterrno(error);
-	}
-	rump_unschedule();
-	return retval;
-}
-
-int
-rump_sys_nb5_futimes(int fd, const struct timeval times[2])
-{
-	struct

CVS commit: src/sys/kern

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 16:21:40 UTC 2011

Modified Files:
src/sys/kern: syscalls.master

Log Message:
Mark a few 5.0 COMPAT syscalls as RUMP now that it's possible


To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 src/sys/kern/syscalls.master

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/syscalls.master
diff -u src/sys/kern/syscalls.master:1.240 src/sys/kern/syscalls.master:1.241
--- src/sys/kern/syscalls.master:1.240	Mon Jan 10 04:39:18 2011
+++ src/sys/kern/syscalls.master	Mon Jan 17 16:21:40 2011
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.240 2011/01/10 04:39:18 christos Exp $
+	$NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -198,7 +198,7 @@
 90	STD 	 RUMP	{ int|sys||dup2(int from, int to); }
 91	UNIMPL		getdopt
 92	STD	RUMP	{ int|sys||fcntl(int fd, int cmd, ... void *arg); }
-93	COMPAT_50 MODULAR 	{ int|sys||select(int nd, fd_set *in, fd_set *ou, \
+93	COMPAT_50 MODULAR RUMP	{ int|sys||select(int nd, fd_set *in, fd_set *ou, \
 			fd_set *ex, struct timeval50 *tv); }
 94	UNIMPL		setdopt
 95	STD	RUMP 	{ int|sys||fsync(int fd); }
@@ -266,7 +266,7 @@
 			int protocol, int *rsv); }
 136	STD 	 RUMP	{ int|sys||mkdir(const char *path, mode_t mode); }
 137	STD 	 RUMP	{ int|sys||rmdir(const char *path); }
-138	COMPAT_50 MODULAR { int|sys||utimes(const char *path, \
+138	COMPAT_50 MODULAR RUMP { int|sys||utimes(const char *path, \
 			const struct timeval50 *tptr); }
 139	OBSOL		4.2 sigreturn
 140	COMPAT_50 MODULAR { int|sys||adjtime(const struct timeval50 *delta, \
@@ -392,7 +392,7 @@
 203	STD 		{ int|sys||mlock(const void *addr, size_t len); }
 204	STD 		{ int|sys||munlock(const void *addr, size_t len); }
 205	STD 		{ int|sys||undelete(const char *path); }
-206	COMPAT_50 MODULAR { int|sys||futimes(int fd, \
+206	COMPAT_50 MODULAR RUMP { int|sys||futimes(int fd, \
 			const struct timeval50 *tptr); }
 207	STD 	 RUMP	{ pid_t|sys||getpgid(pid_t pid); }
 208	STD	 RUMP	{ int|sys||reboot(int opt, char *bootstr); }
@@ -527,7 +527,7 @@
 274	STD 	 RUMP	{ int|sys||lchmod(const char *path, mode_t mode); }
 275	STD 	 RUMP	{ int|sys||lchown(const char *path, uid_t uid, \
 			gid_t gid); }
-276	COMPAT_50 MODULAR { int|sys||lutimes(const char *path, \
+276	COMPAT_50 MODULAR RUMP { int|sys||lutimes(const char *path, \
 			const struct timeval50 *tptr); }
 277	STD 		{ int|sys|13|msync(void *addr, size_t len, int flags); }
 278	COMPAT_30 MODULAR { int|sys|13|stat(const char *path, struct stat13 *ub); }
@@ -647,7 +647,7 @@
 342	STD		{ int|sys||pmc_control(int ctr, int op, void *args); }
 343	STD 		{ int|sys||rasctl(void *addr, size_t len, int op); }
 344	STD	RUMP	{ int|sys||kqueue(void); }
-345	COMPAT_50 MODULAR { int|sys||kevent(int fd, \
+345	COMPAT_50 MODULAR RUMP { int|sys||kevent(int fd, \
 			const struct kevent *changelist, size_t nchanges, \
 			struct kevent *eventlist, size_t nevents, \
 			const struct timespec50 *timeout); }
@@ -713,7 +713,7 @@
 373	COMPAT_50 MODULAR { int|sys||pselect(int nd, fd_set *in, fd_set *ou, \
 			fd_set *ex, const struct timespec50 *ts, \
 			const sigset_t *mask); }
-374	COMPAT_50 MODULAR { int|sys||pollts(struct pollfd *fds, u_int nfds, \
+374	COMPAT_50 MODULAR RUMP { int|sys||pollts(struct pollfd *fds, u_int nfds, \
 			const struct timespec50 *ts, const sigset_t *mask); }
 375	STD 	RUMP	{ int|sys||setxattr(const char *path, \
 			const char *name, void *value, size_t size, \
@@ -742,9 +742,9 @@
 			const char *name); }
 386	STD 	RUMP	{ int|sys||fremovexattr(int fd, \
 			const char *name); }
-387	COMPAT_50 MODULAR { int|sys|30|stat(const char *path, struct stat30 *ub); }
-388	COMPAT_50 MODULAR { int|sys|30|fstat(int fd, struct stat30 *sb); }
-389	COMPAT_50 MODULAR { int|sys|30|lstat(const char *path, struct stat30 *ub); }
+387	COMPAT_50 MODULAR RUMP { int|sys|30|stat(const char *path, struct stat30 *ub); }
+388	COMPAT_50 MODULAR RUMP { int|sys|30|fstat(int fd, struct stat30 *sb); }
+389	COMPAT_50 MODULAR RUMP { int|sys|30|lstat(const char *path, struct stat30 *ub); }
 390	STD 	RUMP	{ int|sys|30|getdents(int fd, char *buf, size_t count); }
 391	IGNORED		old posix_fadvise
 392	COMPAT_30 MODULAR { int|sys|30|fhstat(const struct compat_30_fhandle \

CVS commit: src/sys

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 16:22:53 UTC 2011

Modified Files:
src/sys/kern: init_sysent.c syscalls.c
src/sys/sys: syscall.h syscallargs.h

Log Message:
regen with no changes (to show previous commits affected rump only)


To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.240 -r1.241 src/sys/kern/syscalls.c
cvs rdiff -u -r1.236 -r1.237 src/sys/sys/syscall.h
cvs rdiff -u -r1.219 -r1.220 src/sys/sys/syscallargs.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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.249 src/sys/kern/init_sysent.c:1.250
--- src/sys/kern/init_sysent.c:1.249	Mon Jan 10 04:42:24 2011
+++ src/sys/kern/init_sysent.c	Mon Jan 17 16:22:53 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.249 2011/01/10 04:42:24 christos Exp $ */
+/* $NetBSD: init_sysent.c,v 1.250 2011/01/17 16:22:53 pooka Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.240 2011/01/10 04:39:18 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.249 2011/01/10 04:42:24 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.250 2011/01/17 16:22:53 pooka Exp $);
 
 #include opt_modular.h
 #include opt_ntp.h

Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.240 src/sys/kern/syscalls.c:1.241
--- src/sys/kern/syscalls.c:1.240	Mon Jan 10 04:42:24 2011
+++ src/sys/kern/syscalls.c	Mon Jan 17 16:22:53 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.240 2011/01/10 04:42:24 christos Exp $ */
+/* $NetBSD: syscalls.c,v 1.241 2011/01/17 16:22:53 pooka Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.240 2011/01/10 04:39:18 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.240 2011/01/10 04:42:24 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.241 2011/01/17 16:22:53 pooka Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_modular.h

Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.236 src/sys/sys/syscall.h:1.237
--- src/sys/sys/syscall.h:1.236	Mon Jan 10 04:42:25 2011
+++ src/sys/sys/syscall.h	Mon Jan 17 16:22:53 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.236 2011/01/10 04:42:25 christos Exp $ */
+/* $NetBSD: syscall.h,v 1.237 2011/01/17 16:22:53 pooka Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.240 2011/01/10 04:39:18 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp
  */
 
 #ifndef _SYS_SYSCALL_H_

Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.219 src/sys/sys/syscallargs.h:1.220
--- src/sys/sys/syscallargs.h:1.219	Mon Jan 10 04:42:25 2011
+++ src/sys/sys/syscallargs.h	Mon Jan 17 16:22:53 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.219 2011/01/10 04:42:25 christos Exp $ */
+/* $NetBSD: syscallargs.h,v 1.220 2011/01/17 16:22:53 pooka Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.240 2011/01/10 04:39:18 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp
  */
 
 #ifndef _SYS_SYSCALLARGS_H_

CVS commit: src/sys/rump/include/rump

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 16:25:39 UTC 2011

Modified Files:
src/sys/rump/include/rump: rump_syscalls_compat.h

Log Message:
use newstyle rump syscall compat


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/include/rump/rump_syscalls_compat.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/include/rump/rump_syscalls_compat.h
diff -u src/sys/rump/include/rump/rump_syscalls_compat.h:1.5 src/sys/rump/include/rump/rump_syscalls_compat.h:1.6
--- src/sys/rump/include/rump/rump_syscalls_compat.h:1.5	Tue Jan  4 17:00:19 2011
+++ src/sys/rump/include/rump/rump_syscalls_compat.h	Mon Jan 17 16:25:39 2011
@@ -1,7 +1,7 @@
-/*	$NetBSD: rump_syscalls_compat.h,v 1.5 2011/01/04 17:00:19 pooka Exp $	*/
+/*	$NetBSD: rump_syscalls_compat.h,v 1.6 2011/01/17 16:25:39 pooka Exp $	*/
 
 /*-
- * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,48 +29,26 @@
 #define _RUMP_RUMP_SYSCALLS_COMPAT_H_
 
 #ifndef _KERNEL
-/*
- * Compat calls.  They're manual now.  Note the slightly non-standard
- * naming.  This is because we cannot exploit __RENAME() the same way
- * normal builds exploit it -- we want to build *new* files linked
- * against these symbols.  Note that the defines don't allow calling
- * the current ones from a old userland, should that be desired for
- * whatever reason.  
- */
 #ifdef __NetBSD__
 #include sys/param.h
+
+/* time_t change */
 #if !__NetBSD_Prereq__(5,99,7)
-#define rump_sys_stat(a,b) rump_sys_nb5_stat(a,b)
-#define rump_sys_lstat(a,b) rump_sys_nb5_lstat(a,b)
-#define rump_sys_fstat(a,b) rump_sys_nb5_fstat(a,b)
-#define rump_sys_pollts(a,b,c,d) rump_sys_nb5_pollts(a,b,c,d)
-#define rump_sys_select(a,b,c,d,e) rump_sys_nb5_select(a,b,c,d,e)
-#define rump_sys_utimes(a,b) rump_sys_nb5_utimes(a,b)
-#define rump_sys_lutimes(a,b) rump_sys_nb5_lutimes(a,b)
-#define rump_sys_futimes(a,b) rump_sys_nb5_futimes(a,b)
-#endif /* __NetBSD_Prereq */
+#define RUMP_SYS_RENAME_STAT rump___sysimpl_stat30
+#define RUMP_SYS_RENAME_FSTAT rump___sysimpl_fstat30
+#define RUMP_SYS_RENAME_LSTAT rump___sysimpl_lstat30
+
+#define RUMP_SYS_RENAME_POLLTS rump___sysimpl_pollts
+#define RUMP_SYS_RENAME_SELECT rump___sysimpl_select
+#define RUMP_SYS_RENAME_PSELECT rump___sysimpl_pselect
+#define RUMP_SYS_RENAME_KEVENT rump___sysimpl_kevent
+
+#define RUMP_SYS_RENAME_UTIMES rump___sysimpl_utimes
+#define RUMP_SYS_RENAME_FUTIMES rump___sysimpl_futimes
+#define RUMP_SYS_RENAME_LUTIMES rump___sysimpl_lutimes
+#endif /* __NetBSD_Prereq(5,99,7) */
+
 #endif /* __NetBSD__ */
 #endif /* _KERNEL */
 
-#ifdef _BEGIN_DECLS
-_BEGIN_DECLS  
-#endif
-
-struct stat;
-struct pollfd;
-struct timespec;
-int rump_sys_nb5_stat(const char *, struct stat *);
-int rump_sys_nb5_lstat(const char *, struct stat *);
-int rump_sys_nb5_fstat(int, struct stat *);
-int rump_sys_nb5_pollts(struct pollfd *, size_t,
-			const struct timespec *, const void *);
-int rump_sys_nb5_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-int rump_sys_nb5_utimes(const char *, const struct timeval *);
-int rump_sys_nb5_lutimes(const char *, const struct timeval *);
-int rump_sys_nb5_futimes(int, const struct timeval *);
-
-#ifdef _END_DECLS
-_END_DECLS
-#endif
-
 #endif /* _RUMP_RUMP_SYSCALLS_COMPAT_H_ */

CVS commit: src/lib/librumphijack

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 16:27:54 UTC 2011

Modified Files:
src/lib/librumphijack: hijack.c

Log Message:
Adapt to rump syscall changes.  The correct rump compat syscall is
now automatically picked based on the ABI of the target the library
is compiled for.

(the host libc symbolname to override still needs a little attention
based on the system version)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.7 src/lib/librumphijack/hijack.c:1.8
--- src/lib/librumphijack/hijack.c:1.7	Sun Jan  9 19:56:33 2011
+++ src/lib/librumphijack/hijack.c	Mon Jan 17 16:27:54 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: hijack.c,v 1.7 2011/01/09 19:56:33 pooka Exp $	*/
+/*  $NetBSD: hijack.c,v 1.8 2011/01/17 16:27:54 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.7 2011/01/09 19:56:33 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.8 2011/01/17 16:27:54 pooka Exp $);
 
 #include sys/param.h
 #include sys/types.h
@@ -34,7 +34,6 @@
 #include sys/socket.h
 #include sys/poll.h
 
-#include rump/rump.h
 #include rump/rumpclient.h
 #include rump/rump_syscalls.h
 
@@ -47,6 +46,7 @@
 #include pthread.h
 #include signal.h
 #include stdarg.h
+#include stdbool.h
 #include stdio.h
 #include stdlib.h
 #include time.h
@@ -66,29 +66,32 @@
 	RUMPCALL__NUM
 };
 
+#define RSYS_STRING(a) __STRING(a)
+#define RSYS_NAME(a) RSYS_STRING(__CONCAT(RUMP_SYS_RENAME_,a))
+
 const char *sysnames[] = {
-	__socket30,
-	accept,
-	bind,
-	connect,
-	getpeername,
-	getsockname,
-	listen,
-	recvfrom,
-	recvmsg,
-	sendto,
-	sendmsg,
-	getsockopt,
-	setsockopt,
-	shutdown,
-	read,
-	readv,
-	write,
-	writev,
-	ioctl,
-	fcntl,
-	close,
-	__pollts50,
+	RSYS_NAME(SOCKET),
+	RSYS_NAME(ACCEPT),
+	RSYS_NAME(BIND),
+	RSYS_NAME(CONNECT),
+	RSYS_NAME(GETPEERNAME),
+	RSYS_NAME(GETSOCKNAME),
+	RSYS_NAME(LISTEN),
+	RSYS_NAME(RECVFROM),
+	RSYS_NAME(RECVMSG),
+	RSYS_NAME(SENDTO),
+	RSYS_NAME(SENDMSG),
+	RSYS_NAME(GETSOCKOPT),
+	RSYS_NAME(SETSOCKOPT),
+	RSYS_NAME(SHUTDOWN),
+	RSYS_NAME(READ),
+	RSYS_NAME(READV),
+	RSYS_NAME(WRITE),
+	RSYS_NAME(WRITEV),
+	RSYS_NAME(IOCTL),
+	RSYS_NAME(FCNTL),
+	RSYS_NAME(CLOSE),
+	RSYS_NAME(POLLTS),
 };
 
 static int	(*host_socket)(int, int, int);
@@ -166,12 +169,10 @@
 	host_dup2 = dlsym(RTLD_NEXT, dup2);
 
 	for (i = 0; i  RUMPCALL__NUM; i++) {
-		char sysname[128];
-
-		snprintf(sysname, sizeof(sysname), rump_sys_%s, sysnames[i]);
-		rumpcalls[i] = dlsym(hand, sysname);
+		rumpcalls[i] = dlsym(hand, sysnames[i]);
 		if (!rumpcalls[i]) {
-			fprintf(stderr, cannot find symbol: %s\n, sysname);
+			fprintf(stderr, rumphijack: cannot find symbol: %s\n,
+			sysnames[i]);
 			exit(1);
 		}
 	}
@@ -790,11 +791,6 @@
 	}
 }
 
-struct mytimespec {
-	uint64_t tv_sec;
-	long tv_nsec;
-};
-
 /*
  * poll is easy as long as the call comes in the fds only in one
  * kernel.  otherwise its quite tricky...
@@ -833,16 +829,6 @@
 	nfds_t i;
 	int rv;
 
-#if 0
-	/* XXX: quick 5.0 kludge.  do syscall compat in rumpclient properly */
-	struct mytimespec mts;
-	if (ts) {
-		mts.tv_sec = ts-tv_sec;
-		mts.tv_nsec = ts-tv_nsec;
-		ts = (struct timespec *)mts;
-	}
-#endif
-
 	DPRINTF((poll\n));
 	checkpoll(fds, nfds, hostcall, rumpcall);

CVS commit: src/lib/librumphijack

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 16:30:09 UTC 2011

Modified Files:
src/lib/librumphijack: hijack.c

Log Message:
Use host_close() instead of close() where we know it to be the
right interface.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.8 src/lib/librumphijack/hijack.c:1.9
--- src/lib/librumphijack/hijack.c:1.8	Mon Jan 17 16:27:54 2011
+++ src/lib/librumphijack/hijack.c	Mon Jan 17 16:30:09 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: hijack.c,v 1.8 2011/01/17 16:27:54 pooka Exp $	*/
+/*  $NetBSD: hijack.c,v 1.9 2011/01/17 16:30:09 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.8 2011/01/17 16:27:54 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.9 2011/01/17 16:30:09 pooka Exp $);
 
 #include sys/param.h
 #include sys/types.h
@@ -932,9 +932,9 @@
 		if (rpipe[1] != -1)
 			rump_sys_close(rpipe[1]);
 		if (hpipe[0] != -1)
-			close(hpipe[0]);
+			host_close(hpipe[0]);
 		if (hpipe[1] != -1)
-			close(hpipe[1]);
+			host_close(hpipe[1]);
 		free(pfd_host);
 		free(pfd_rump);
 		errno = sverrno;

CVS commit: src/sys/dev/acpi

2011-01-17 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 17 17:32:11 UTC 2011

Modified Files:
src/sys/dev/acpi: acpi_wdrt.c

Log Message:
use PRIx64 instead of llx, fixes build on amd64


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/acpi_wdrt.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/acpi/acpi_wdrt.c
diff -u src/sys/dev/acpi/acpi_wdrt.c:1.1 src/sys/dev/acpi/acpi_wdrt.c:1.2
--- src/sys/dev/acpi/acpi_wdrt.c:1.1	Mon Jan 17 15:49:13 2011
+++ src/sys/dev/acpi/acpi_wdrt.c	Mon Jan 17 17:32:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wdrt.c,v 1.1 2011/01/17 15:49:13 jmcneill Exp $ */
+/* $NetBSD: acpi_wdrt.c,v 1.2 2011/01/17 17:32:11 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -35,7 +35,7 @@
 /* #define ACPIWDRT_DEBUG */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_wdrt.c,v 1.1 2011/01/17 15:49:13 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_wdrt.c,v 1.2 2011/01/17 17:32:11 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -194,7 +194,7 @@
 	sc-sc_count_reg = wdrt-CountRegister;
 
 	aprint_naive(\n);
-	aprint_normal(: mem 0x%llx,0x%llx\n,
+	aprint_normal(: mem 0x% PRIx64 ,0x% PRIx64 \n,
 	sc-sc_control_reg.Address, sc-sc_count_reg.Address);
 
 	if (wdrt-PciVendorId != 0x  wdrt-PciDeviceId != 0x) {
@@ -344,7 +344,8 @@
 	rv = AcpiOsReadMemory(sc-sc_control_reg.Address,
 	val, sc-sc_control_reg.BitWidth);
 
-	DPRINTF((%s: %s 0x%llx/%u 0x%08x (%u)\n, device_xname(sc-sc_dev),
+	DPRINTF((%s: %s 0x% PRIx64 /%u 0x%08x (%u)\n,
+	device_xname(sc-sc_dev),
 	__func__, sc-sc_control_reg.Address, sc-sc_control_reg.BitWidth,
 	*val, rv));
 
@@ -361,7 +362,8 @@
 	rv = AcpiOsWriteMemory(sc-sc_control_reg.Address,
 	val, sc-sc_control_reg.BitWidth);
 
-	DPRINTF((%s: %s 0x%llx/%u 0x%08x (%u)\n, device_xname(sc-sc_dev),
+	DPRINTF((%s: %s 0x% PRIx64 /%u 0x%08x (%u)\n,
+	device_xname(sc-sc_dev),
 	__func__, sc-sc_control_reg.Address, sc-sc_control_reg.BitWidth,
 	val, rv));
 
@@ -379,7 +381,8 @@
 	rv = AcpiOsReadMemory(sc-sc_count_reg.Address,
 	val, sc-sc_count_reg.BitWidth);
 
-	DPRINTF((%s: %s 0x%llx/%u 0x%08x (%u)\n, device_xname(sc-sc_dev),
+	DPRINTF((%s: %s 0x% PRIx64 /%u 0x%08x (%u)\n,
+	device_xname(sc-sc_dev),
 	__func__, sc-sc_count_reg.Address, sc-sc_count_reg.BitWidth,
 	*val, rv));
 
@@ -397,7 +400,8 @@
 	rv = AcpiOsWriteMemory(sc-sc_count_reg.Address,
 	val, sc-sc_count_reg.BitWidth);
 
-	DPRINTF((%s: %s 0x%llx/%u 0x%08x (%u)\n, device_xname(sc-sc_dev),
+	DPRINTF((%s: %s 0x% PRIx64 /%u 0x%08x (%u)\n,
+	device_xname(sc-sc_dev),
 	__func__, sc-sc_count_reg.Address, sc-sc_count_reg.BitWidth,
 	val, rv));

CVS commit: src/share/mk

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 18:05:52 UTC 2011

Modified Files:
src/share/mk: bsd.prog.mk

Log Message:
Add rump bits to DPSRCS so that update builds work correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/share/mk/bsd.prog.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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.256 src/share/mk/bsd.prog.mk:1.257
--- src/share/mk/bsd.prog.mk:1.256	Mon Dec 13 21:47:04 2010
+++ src/share/mk/bsd.prog.mk	Mon Jan 17 18:05:52 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.256 2010/12/13 21:47:04 pooka Exp $
+#	$NetBSD: bsd.prog.mk,v 1.257 2011/01/17 18:05:52 pooka Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -220,6 +220,7 @@
 SRCS=			${PROG}.c ${PROG}_hostops.c
 SRCS.rump.${PROG}=	${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
 . endif
+DPSRCS+=		${PROG}_rumpops.c ${RUMPSRCS}
 LDADD.rump.${PROG}+=	-lrumpclient
 DPADD.rump.${PROG}+=	${LIBRUMPCLIENT}
 MAN.rump.${PROG}=	# defined but feeling empty

CVS commit: src

2011-01-17 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Mon Jan 17 18:11:10 UTC 2011

Modified Files:
src: UPDATING
src/common/lib/libc/arch/sparc/atomic: atomic_op_asm.h
src/common/lib/libc/arch/sparc64/atomic: atomic_op_asm.h
src/share/mk: sys.mk
src/sys/arch/sparc/conf: Makefile.sparc
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/sparc64/conf: Makefile.sparc64

Log Message:
Move SPARC and SPARC64 to modern CPP. Update UPDATING note for this and
Alpha.


To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/UPDATING
cvs rdiff -u -r1.5 -r1.6 \
src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h
cvs rdiff -u -r1.5 -r1.6 \
src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h
cvs rdiff -u -r1.102 -r1.103 src/share/mk/sys.mk
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sparc/conf/Makefile.sparc
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc64/conf/Makefile.sparc64

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

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.218 src/UPDATING:1.219
--- src/UPDATING:1.218	Sat Jan 15 16:13:59 2011
+++ src/UPDATING	Mon Jan 17 18:11:09 2011
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.218 2011/01/15 16:13:59 joerg Exp $
+$NetBSD: UPDATING,v 1.219 2011/01/17 18:11:09 joerg Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -15,8 +15,13 @@
 
 Recent changes:
 ^^^
-20110112:
-	Assembler files on amd64 and i386 no longer use -traditional-cpp.
+20110117:
+	Assembler files on the following platforms no longer use -tradition-cpp:
+	- Alpha,
+	- AMD64,
+	- i386,
+	- SPARC,
+	- SPARC64.
 	This can break the build of individual parts of the tree.  This is
 	handled correctly by build.sh.  Manual builds have to update
 	/usr/share/mk and re-run config(1) for any kernel configurations as

Index: src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h
diff -u src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h:1.5 src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h:1.6
--- src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h:1.5	Mon Apr 28 20:22:52 2008
+++ src/common/lib/libc/arch/sparc/atomic/atomic_op_asm.h	Mon Jan 17 18:11:09 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic_op_asm.h,v 1.5 2008/04/28 20:22:52 martin Exp $	*/
+/*	$NetBSD: atomic_op_asm.h,v 1.6 2011/01/17 18:11:09 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -39,9 +39,9 @@
 #define	ATOMIC_OP_ALIAS(a,s)		STRONG_ALIAS(a,s)
 
 #ifdef __arch64__
-#define	ATOMIC_OP_ALIAS_SIZE(a,s)	STRONG_ALIAS(a,s/**/_64)
+#define	ATOMIC_OP_ALIAS_SIZE(a,s)	STRONG_ALIAS(a,s ## _64)
 #else
-#define	ATOMIC_OP_ALIAS_SIZE(a,s)	STRONG_ALIAS(a,s/**/_32)
+#define	ATOMIC_OP_ALIAS_SIZE(a,s)	STRONG_ALIAS(a,s ## _32)
 #endif
 
 #else /* _KERNEL */
@@ -49,17 +49,17 @@
 #define	ATOMIC_OP_ALIAS(a,s)		WEAK_ALIAS(a,s)
 
 #ifdef __arch64__
-#define	ATOMIC_OP_ALIAS_SIZE(a,s)	WEAK_ALIAS(a,s/**/_64)
+#define	ATOMIC_OP_ALIAS_SIZE(a,s)	WEAK_ALIAS(a,s ## _64)
 #else
-#define	ATOMIC_OP_ALIAS_SIZE(a,s)	WEAK_ALIAS(a,s/**/_32)
+#define	ATOMIC_OP_ALIAS_SIZE(a,s)	WEAK_ALIAS(a,s ## _32)
 #endif
 
 #endif /* _KERNEL */
 
 #ifdef __arch64__
-#define	STRONG_ALIAS_SIZE(a,s)		STRONG_ALIAS(a,s/**/_64)
+#define	STRONG_ALIAS_SIZE(a,s)		STRONG_ALIAS(a,s ## _64)
 #else
-#define	STRONG_ALIAS_SIZE(a,s)		STRONG_ALIAS(a,s/**/_32)
+#define	STRONG_ALIAS_SIZE(a,s)		STRONG_ALIAS(a,s ## _32)
 #endif
 
 #endif /* _ATOMIC_OP_ASM_H_ */

Index: src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h
diff -u src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h:1.5 src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h:1.6
--- src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h:1.5	Mon Apr 28 20:22:52 2008
+++ src/common/lib/libc/arch/sparc64/atomic/atomic_op_asm.h	Mon Jan 17 18:11:10 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic_op_asm.h,v 1.5 2008/04/28 20:22:52 martin Exp $	*/
+/*	$NetBSD: atomic_op_asm.h,v 1.6 2011/01/17 18:11:10 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -39,9 +39,9 @@
 #define	ATOMIC_OP_ALIAS(a,s)		STRONG_ALIAS(a,s)
 
 #ifdef __arch64__
-#define	ATOMIC_OP_ALIAS_SIZE(a,s)	STRONG_ALIAS(a,s/**/_64)
+#define	ATOMIC_OP_ALIAS_SIZE(a,s)	STRONG_ALIAS(a,s ## _64)
 #else
-#define	ATOMIC_OP_ALIAS_SIZE(a,s)	STRONG_ALIAS(a,s/**/_32)
+#define	ATOMIC_OP_ALIAS_SIZE(a,s)	STRONG_ALIAS(a,s ## _32)
 #endif
 
 #else /* _KERNEL */
@@ -49,17 +49,17 @@
 #define	ATOMIC_OP_ALIAS(a,s)		WEAK_ALIAS(a,s)
 
 #ifdef __arch64__
-#define	ATOMIC_OP_ALIAS_SIZE(a,s)	WEAK_ALIAS(a,s/**/_64)
+#define	ATOMIC_OP_ALIAS_SIZE(a,s)	WEAK_ALIAS(a,s ## _64)
 #else
-#define	ATOMIC_OP_ALIAS_SIZE(a,s)	WEAK_ALIAS(a,s/**/_32)
+#define	ATOMIC_OP_ALIAS_SIZE(a,s)	WEAK_ALIAS(a,s ## _32)
 #endif
 
 #endif /* _KERNEL */
 
 #ifdef __arch64__

CVS commit: src/sys

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 18:24:17 UTC 2011

Modified Files:
src/sys/kern: syscalls.master
src/sys/rump/include/rump: rump_syscalls_compat.h

Log Message:
Missed pselect50 in previous (file was open in editor ... d0h).
Add mknod50 and fhstat50 too.


To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/kern/syscalls.master
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/include/rump/rump_syscalls_compat.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/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.241 src/sys/kern/syscalls.master:1.242
--- src/sys/kern/syscalls.master:1.241	Mon Jan 17 16:21:40 2011
+++ src/sys/kern/syscalls.master	Mon Jan 17 18:24:17 2011
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp $
+	$NetBSD: syscalls.master,v 1.242 2011/01/17 18:24:17 pooka Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -80,7 +80,7 @@
 11	OBSOL		execv
 12	STD 	 RUMP	{ int|sys||chdir(const char *path); }
 13	STD 	 RUMP	{ int|sys||fchdir(int fd); }
-14	COMPAT_50 MODULAR { int|sys||mknod(const char *path, mode_t mode, \
+14	COMPAT_50 MODULAR RUMP { int|sys||mknod(const char *path, mode_t mode, \
 			uint32_t dev); }
 15	STD 	 RUMP	{ int|sys||chmod(const char *path, mode_t mode); }
 16	STD 	 RUMP	{ int|sys||chown(const char *path, uid_t uid, \
@@ -710,7 +710,7 @@
 			int attrnamespace, void *data, size_t nbytes); }
 372	STD 	RUMP	{ ssize_t|sys||extattr_list_link(const char *path, \
 			int attrnamespace, void *data, size_t nbytes); }
-373	COMPAT_50 MODULAR { int|sys||pselect(int nd, fd_set *in, fd_set *ou, \
+373	COMPAT_50 MODULAR RUMP { int|sys||pselect(int nd, fd_set *in, fd_set *ou, \
 			fd_set *ex, const struct timespec50 *ts, \
 			const sigset_t *mask); }
 374	COMPAT_50 MODULAR RUMP { int|sys||pollts(struct pollfd *fds, u_int nfds, \
@@ -757,7 +757,7 @@
 			int flags); }
 397	STD 	 RUMP	{ int|sys|40|fhstatvfs1(const void *fhp, \
 			size_t fh_size, struct statvfs *buf, int flags); }
-398	COMPAT_50 MODULAR { int|sys|40|fhstat(const void *fhp, \
+398	COMPAT_50 MODULAR RUMP { int|sys|40|fhstat(const void *fhp, \
 			size_t fh_size, struct stat30 *sb); }
 
 ; Asynchronous I/O system calls

Index: src/sys/rump/include/rump/rump_syscalls_compat.h
diff -u src/sys/rump/include/rump/rump_syscalls_compat.h:1.6 src/sys/rump/include/rump/rump_syscalls_compat.h:1.7
--- src/sys/rump/include/rump/rump_syscalls_compat.h:1.6	Mon Jan 17 16:25:39 2011
+++ src/sys/rump/include/rump/rump_syscalls_compat.h	Mon Jan 17 18:24:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_syscalls_compat.h,v 1.6 2011/01/17 16:25:39 pooka Exp $	*/
+/*	$NetBSD: rump_syscalls_compat.h,v 1.7 2011/01/17 18:24:17 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -46,6 +46,9 @@
 #define RUMP_SYS_RENAME_UTIMES rump___sysimpl_utimes
 #define RUMP_SYS_RENAME_FUTIMES rump___sysimpl_futimes
 #define RUMP_SYS_RENAME_LUTIMES rump___sysimpl_lutimes
+
+#define RUMP_SYS_RENAME_MKNOD rump___sysimpl_mknod
+#define RUMP_SYS_RENAME_FHSTAT rump___sysimpl_fhstat40
 #endif /* __NetBSD_Prereq(5,99,7) */
 
 #endif /* __NetBSD__ */

CVS commit: src/sys/rump

2011-01-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Mon Jan 17 18:25:18 UTC 2011

Modified Files:
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c

Log Message:
regen: more compat syscalls


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.60 -r1.61 src/sys/rump/librump/rumpkern/rump_syscalls.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/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.38 src/sys/rump/include/rump/rump_syscalls.h:1.39
--- src/sys/rump/include/rump/rump_syscalls.h:1.38	Mon Jan 17 16:24:04 2011
+++ src/sys/rump/include/rump/rump_syscalls.h	Mon Jan 17 18:25:17 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.38 2011/01/17 16:24:04 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.39 2011/01/17 18:25:17 pooka Exp $ */
 
 /*
  * System call protos in rump namespace.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp
+ * created from	NetBSD: syscalls.master,v 1.242 2011/01/17 18:24:17 pooka Exp
  */
 
 #ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -632,6 +632,7 @@
 int rump_sys_unlink(const char *) __RENAME(RUMP_SYS_RENAME_UNLINK);
 int rump_sys_chdir(const char *) __RENAME(RUMP_SYS_RENAME_CHDIR);
 int rump_sys_fchdir(int) __RENAME(RUMP_SYS_RENAME_FCHDIR);
+int rump_sys_mknod(const char *, mode_t, uint32_t) __RENAME(RUMP_SYS_RENAME_MKNOD);
 int rump_sys_chmod(const char *, mode_t) __RENAME(RUMP_SYS_RENAME_CHMOD);
 int rump_sys_chown(const char *, uid_t, gid_t) __RENAME(RUMP_SYS_RENAME_CHOWN);
 pid_t rump_sys_getpid(void) __RENAME(RUMP_SYS_RENAME_GETPID_WITH_PPID);
@@ -746,6 +747,7 @@
 ssize_t rump_sys_extattr_list_fd(int, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_LIST_FD);
 ssize_t rump_sys_extattr_list_file(const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_LIST_FILE);
 ssize_t rump_sys_extattr_list_link(const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_LIST_LINK);
+int rump_sys_pselect(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_PSELECT);
 int rump_sys_pollts(struct pollfd *, u_int, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_POLLTS);
 int rump_sys_setxattr(const char *, const char *, void *, size_t, int) __RENAME(RUMP_SYS_RENAME_SETXATTR);
 int rump_sys_lsetxattr(const char *, const char *, void *, size_t, int) __RENAME(RUMP_SYS_RENAME_LSETXATTR);
@@ -767,11 +769,9 @@
 int rump_sys_getfh(const char *, void *, size_t *) __RENAME(RUMP_SYS_RENAME_GETFH);
 int rump_sys_fhopen(const void *, size_t, int) __RENAME(RUMP_SYS_RENAME_FHOPEN);
 int rump_sys_fhstatvfs1(const void *, size_t, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_FHSTATVFS1);
+int rump_sys_fhstat(const void *, size_t, struct stat *) __RENAME(RUMP_SYS_RENAME_FHSTAT);
 int rump_sys_mount(const char *, const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_MOUNT);
 int rump_sys_posix_fadvise(int, off_t, off_t, int) __RENAME(RUMP_SYS_RENAME_POSIX_FADVISE);
-int rump_sys_pselect(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_PSELECT);
-int rump_sys_mknod(const char *, mode_t, dev_t) __RENAME(RUMP_SYS_RENAME_MKNOD);
-int rump_sys_fhstat(const void *, size_t, struct stat *) __RENAME(RUMP_SYS_RENAME_FHSTAT);
 int rump_sys_pipe(int *);
 
 #endif /* _RUMP_RUMP_SYSCALLS_H_ */

Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.60 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.61
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.60	Mon Jan 17 16:24:04 2011
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c	Mon Jan 17 18:25:17 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: rump_syscalls.c,v 1.60 2011/01/17 16:24:04 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.61 2011/01/17 18:25:17 pooka Exp $ */
 
 /*
  * System call vector and marshalling for rump.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.241 2011/01/17 16:21:40 pooka Exp
+ * created from	NetBSD: syscalls.master,v 1.242 2011/01/17 18:24:17 pooka Exp
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.60 2011/01/17 16:24:04 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.61 2011/01/17 18:25:17 pooka Exp $);
 
 #include sys/param.h
 #include sys/fstypes.h
@@ -224,6 +224,27 @@
 }
 rsys_alias(sys_fchdir,rump_enosys)
 
+int rump___sysimpl_mknod(const char *, mode_t, uint32_t);
+int
+rump___sysimpl_mknod(const char * path, mode_t mode, uint32_t dev)
+{
+	register_t rval[2] = {0, 0};
+	int error = 0;
+	struct compat_50_sys_mknod_args callarg;
+
+	SPARG(callarg, path) = path;
+	SPARG(callarg, mode) = mode;
+

CVS commit: src

2011-01-17 Thread Alistair G. Crooks

:			$Revision: 1.1493 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -829,3 +829,5 @@
 		non-executable). [matt 20110115]
 	acpiwdrt(4): Add a driver for ACPI Watchdog Resource Tables.
 		[jmcneill 20110117]
+	isns(3): Add a library providing iSNS (IETF RFC 4171) protocol
+		support, contributed by Wasabi Systems. [agc 20110117]

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.158 src/lib/Makefile:1.159
--- src/lib/Makefile:1.158	Sun Dec 12 12:09:51 2010
+++ src/lib/Makefile	Mon Jan 17 20:39:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.158 2010/12/12 12:09:51 plunky Exp $
+#	$NetBSD: Makefile,v 1.159 2011/01/17 20:39:03 agc Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include bsd.own.mk
@@ -26,7 +26,7 @@
 SUBDIR+=	libarch \
 		libbluetooth libbsdmalloc libbz2 \
 		libcompat libcrypt \
-		libintl libipsec libkvm libm \
+		libintl libipsec libisns libkvm libm \
 		libossaudio libpci libpmc libposix libprop libpthread \
 		libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
 		librumpclient libtelnet libterminfo \

CVS commit: xsrc/external/mit/xorg-server/include

2011-01-17 Thread Jared D. McNeill

Module Name:xsrc
Committed By:   jmcneill
Date:   Mon Jan 17 20:56:09 UTC 2011

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h

Log Message:
Comment out '#define DEBUG 1', ok mrg and macallan


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xorg-server/include/dix-config.h

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

Modified files:

Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.14 xsrc/external/mit/xorg-server/include/dix-config.h:1.15
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.14	Tue Nov 23 08:16:26 2010
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Mon Jan 17 20:56:09 2011
@@ -254,7 +254,7 @@
 #define MITSHM 1
 
 /* Enable some debugging code */
-#define DEBUG 1
+/* #undef DEBUG */
 
 /* Name of package */
 #ifndef PACKAGE

CVS commit: src/share/man/man4

2011-01-17 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 21:54:28 UTC 2011

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

Log Message:
Complete the reference WWW article. Use .Dq.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/acpiwdrt.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/acpiwdrt.4
diff -u src/share/man/man4/acpiwdrt.4:1.1 src/share/man/man4/acpiwdrt.4:1.2
--- src/share/man/man4/acpiwdrt.4:1.1	Mon Jan 17 16:08:20 2011
+++ src/share/man/man4/acpiwdrt.4	Mon Jan 17 21:54:28 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: acpiwdrt.4,v 1.1 2011/01/17 16:08:20 jmcneill Exp $
+.\	$NetBSD: acpiwdrt.4,v 1.2 2011/01/17 21:54:28 jruoho Exp $
 .\
 .\ Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
 .\ All rights reserved.
@@ -37,7 +37,8 @@
 .Nm
 driver provides support for watchdog timers specified in
 .Tn ACPI
-WDRT tables.
+.Dq WDRT
+tables.
 The
 .Nm
 watchdog timer is configurable via the
@@ -46,7 +47,13 @@
 .Sh SEE ALSO
 .Xr acpi 4 ,
 .Xr wdogctl 8 ,
-.Pa http://www.microsoft.com/whdc/system/sysinternals/watchdog.mspx
+.Rs
+.%A Microsoft Corporation
+.%N Version 1.01
+.%D August 28, 2006
+.%T Watchdog Timer Hardware Requirements for Windows Server 2003
+.%U http://www.microsoft.com/whdc/system/sysinternals/watchdog.mspx
+.Re
 .Sh HISTORY
 The
 .Nm

CVS commit: src/share/man/man4

2011-01-17 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 21:56:39 UTC 2011

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

Log Message:
Xref acpiwdrt(4).


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/share/man/man4/acpi.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/acpi.4
diff -u src/share/man/man4/acpi.4:1.68 src/share/man/man4/acpi.4:1.69
--- src/share/man/man4/acpi.4:1.68	Fri Jan 14 07:11:18 2011
+++ src/share/man/man4/acpi.4	Mon Jan 17 21:56:38 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: acpi.4,v 1.68 2011/01/14 07:11:18 jruoho Exp $
+.\ $NetBSD: acpi.4,v 1.69 2011/01/17 21:56:38 jruoho Exp $
 .\
 .\ Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -24,7 +24,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd January 14, 2011
+.Dd January 17, 2011
 .Dt ACPI 4
 .Os
 .Sh NAME
@@ -260,6 +260,9 @@
 .It Xr acpiwmi 4
 .Tn ACPI
 support for Windows Management Instrumentation.
+.It Xr acpiwdrt 4
+.Tn ACPI
+watchdogs.
 .It Xr aibs 4
 ASUSTeK voltage, temperature and fan sensors.
 .It asus

CVS commit: src/gnu/dist/groff/tmac

2011-01-17 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Jan 17 21:57:04 UTC 2011

Modified Files:
src/gnu/dist/groff/tmac: doc-syms groff_mdoc.man

Log Message:
add libisns


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/gnu/dist/groff/tmac/doc-syms
cvs rdiff -u -r1.14 -r1.15 src/gnu/dist/groff/tmac/groff_mdoc.man

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

Modified files:

Index: src/gnu/dist/groff/tmac/doc-syms
diff -u src/gnu/dist/groff/tmac/doc-syms:1.13 src/gnu/dist/groff/tmac/doc-syms:1.14
--- src/gnu/dist/groff/tmac/doc-syms:1.13	Sun Dec 20 15:15:07 2009
+++ src/gnu/dist/groff/tmac/doc-syms	Mon Jan 17 16:57:04 2011
@@ -692,6 +692,7 @@
 .ds doc-str-Lb-libi386 i386 Architecture Library (libi386, \-li386)
 .ds doc-str-Lb-libintl Internationalized Message Handling Library (libintl, \-lintl)
 .ds doc-str-Lb-libipsecIPsec Policy Control Library (libipsec, \-lipsec)
+.ds doc-str-Lb-libisns Internet Storage Name Service Library (libisns, \-lisns)
 .ds doc-str-Lb-libkvm  Kernel Data Access Library (libkvm, \-lkvm)
 .ds doc-str-Lb-libmMath Library (libm, \-lm)
 .ds doc-str-Lb-libm68k m68k Architecture Library (libm68k, \-lm68k)

Index: src/gnu/dist/groff/tmac/groff_mdoc.man
diff -u src/gnu/dist/groff/tmac/groff_mdoc.man:1.14 src/gnu/dist/groff/tmac/groff_mdoc.man:1.15
--- src/gnu/dist/groff/tmac/groff_mdoc.man:1.14	Sat May 22 20:01:31 2010
+++ src/gnu/dist/groff/tmac/groff_mdoc.man	Mon Jan 17 16:57:04 2011
@@ -1689,6 +1689,8 @@
 .Lb libintl
 .It Li libipsec
 .Lb libipsec
+.It Li libisns
+.Lb libisns
 .It Li libkvm
 .Lb libkvm
 .It Li libm

CVS commit: src/share/man/man4

2011-01-17 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 21:59:41 UTC 2011

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

Log Message:
Furthermore, use ACPI Watchdog Timer as the title.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/acpiwdrt.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/acpiwdrt.4
diff -u src/share/man/man4/acpiwdrt.4:1.2 src/share/man/man4/acpiwdrt.4:1.3
--- src/share/man/man4/acpiwdrt.4:1.2	Mon Jan 17 21:54:28 2011
+++ src/share/man/man4/acpiwdrt.4	Mon Jan 17 21:59:40 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: acpiwdrt.4,v 1.2 2011/01/17 21:54:28 jruoho Exp $
+.\	$NetBSD: acpiwdrt.4,v 1.3 2011/01/17 21:59:40 jruoho Exp $
 .\
 .\ Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
 .\ All rights reserved.
@@ -29,16 +29,16 @@
 .Os
 .Sh NAME
 .Nm acpiwdrt
-.Nd ACPI Watchdog Resource Table device driver
+.Nd ACPI Watchdog Timer
 .Sh SYNOPSIS
 .Cd acpiwdrt* at acpi?
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for watchdog timers specified in
+driver provides support for watchdog timers specified in a so-called
 .Tn ACPI
-.Dq WDRT
-tables.
+watchdog resource table
+.Pq Tn WDRT .
 The
 .Nm
 watchdog timer is configurable via the
@@ -46,7 +46,7 @@
 utility.
 .Sh SEE ALSO
 .Xr acpi 4 ,
-.Xr wdogctl 8 ,
+.Xr wdogctl 8
 .Rs
 .%A Microsoft Corporation
 .%N Version 1.01

CVS commit: src/doc

2011-01-17 Thread Matthias Scheler

Module Name:src
Committed By:   tron
Date:   Mon Jan 17 22:04:14 UTC 2011

Modified Files:
src/doc: 3RDPARTY

Log Message:
Update information about binutils:
- We are using version 2.19.1.
- Add (L)GPLv3 to the list of licenses.


To generate a diff of this commit:
cvs rdiff -u -r1.806 -r1.807 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.806 src/doc/3RDPARTY:1.807
--- src/doc/3RDPARTY:1.806	Thu Jan 13 10:42:54 2011
+++ src/doc/3RDPARTY	Mon Jan 17 22:04:14 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.806 2011/01/13 10:42:54 jruoho Exp $
+#	$NetBSD: 3RDPARTY,v 1.807 2011/01/17 22:04:14 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -131,14 +131,14 @@
 Todo[5]: Reconcile the doc directory.
 
 Package:	binutils
-Version:	2.16.1
+Version:	2.19.1
 Current Vers:	2.21
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/binutils/
 Home Page:	http://www.gnu.org/software/binutils/
 Mailing List:	bug-gnu-ut...@gnu.org
 Responsible:	thorpej, mrg
-License:	GPLv2, LGPLv2, BSD
+License:	GPLv3, LGPLv3, GPLv2, LGPLv2, BSD
 Notes:
 
 Package:	bozohttpd

CVS commit: src/share/misc

2011-01-17 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 22:08:30 UTC 2011

Modified Files:
src/share/misc: acronyms.comp

Log Message:
DPC, IMCR, IRQL, MP, TPR.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/share/misc/acronyms.comp

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

Modified files:

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.115 src/share/misc/acronyms.comp:1.116
--- src/share/misc/acronyms.comp:1.115	Tue Jan  4 06:18:51 2011
+++ src/share/misc/acronyms.comp	Mon Jan 17 22:08:30 2011
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.115 2011/01/04 06:18:51 dholland Exp $
+$NetBSD: acronyms.comp,v 1.116 2011/01/17 22:08:30 jruoho Exp $
 
 3WHS	three-way handshake
 ABI	application binary interface
@@ -149,6 +149,7 @@
 DOM	document object model
 DOS	denial of service
 DOS	disk operating system
+DPC	deferred procedure call
 DPCM	differential pulse code modulation
 DPD	dead peer detection
 DPI	dots per inch
@@ -289,6 +290,7 @@
 IKE	Internet key exchange
 ILP	instruction level parallelism
 IMC	integrated memory controller
+IMCR	interrupt mode configuration register
 IMAP	Internet mail access protocol
 INCITS	international committee on information technology standards
 IO	input/output
@@ -305,6 +307,7 @@
 IRC	Internet relay chat
 IRDA	infrared data association
 IRQ	interrupt request
+IRQL	interrupt request level
 IRTF	Internet research task force
 ISA	industry standard architecture
 ISA	instruction set architecture
@@ -393,6 +396,10 @@
 MMX	multimedia extension
 MMX	multiple math extension
 MMX	matrix math extension
+MP	multiprocessor
+MP	multiprocessing
+MP	multi-platform
+MP	multiplayer
 MPEG	moving picture experts group
 MPLS	multiprotocol label switching
 MPS	multiprocessor specification
@@ -650,6 +657,7 @@
 TOS	terms of service
 TOS	type of service
 TPM	trusted platform module
+TPR	task priority register
 TR	token ring
 TR	task register
 TRNG	true random number generator

CVS commit: src/sys/arch/x86/x86

2011-01-17 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Mon Jan 17 22:21:25 UTC 2011

Modified Files:
src/sys/arch/x86/x86: platform.c

Log Message:
Fix year correction in platform_add_date so that:
* Years in the [90,99] range are considered to be in 1900.
* Years in the [0,89] range are considered to be in 2000.

This makes my MacBookPro2,2 be recognized as from 2007 instead of 1907, which
in turn lets ACPI (and many other things!) work.

Fix proposed by jmcneill@ as an alternative to my workaround in acpi_quirks.c
sent to port-i386@.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/platform.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/platform.c
diff -u src/sys/arch/x86/x86/platform.c:1.9 src/sys/arch/x86/x86/platform.c:1.10
--- src/sys/arch/x86/x86/platform.c:1.9	Mon Sep  6 15:54:27 2010
+++ src/sys/arch/x86/x86/platform.c	Mon Jan 17 22:21:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.c,v 1.9 2010/09/06 15:54:27 jmcneill Exp $ */
+/* $NetBSD: platform.c,v 1.10 2011/01/17 22:21:25 jmmv Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
 #include isa.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: platform.c,v 1.9 2010/09/06 15:54:27 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: platform.c,v 1.10 2011/01/17 22:21:25 jmmv Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -165,10 +165,12 @@
 		return;
 	if (month == 0 || month  12 || day == 0 || day  31)
 		return;
-	if (year  100)
-		year += 1900;
 	if (year  )
 		return;
+	if (year  90)
+		year += 2000;
+	else if (year  100)
+		year += 1900;
 	sprintf(datestr, %04u%02u%02u, year, month, day);
 	pmf_set_platform(key, datestr);
 }

CVS commit: src/share/man/man4

2011-01-17 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 22:53:29 UTC 2011

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

Log Message:
Put the (WDRT) also to the title.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/acpiwdrt.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/acpiwdrt.4
diff -u src/share/man/man4/acpiwdrt.4:1.3 src/share/man/man4/acpiwdrt.4:1.4
--- src/share/man/man4/acpiwdrt.4:1.3	Mon Jan 17 21:59:40 2011
+++ src/share/man/man4/acpiwdrt.4	Mon Jan 17 22:53:29 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: acpiwdrt.4,v 1.3 2011/01/17 21:59:40 jruoho Exp $
+.\	$NetBSD: acpiwdrt.4,v 1.4 2011/01/17 22:53:29 jruoho Exp $
 .\
 .\ Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
 .\ All rights reserved.
@@ -30,6 +30,7 @@
 .Sh NAME
 .Nm acpiwdrt
 .Nd ACPI Watchdog Timer
+.Pq Tn WDRT
 .Sh SYNOPSIS
 .Cd acpiwdrt* at acpi?
 .Sh DESCRIPTION

CVS commit: src/lib/libc/gen

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 23:32:31 UTC 2011

Modified Files:
src/lib/libc/gen: nlist_private.h

Log Message:
cleanup format of #ifdef


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/gen/nlist_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/lib/libc/gen/nlist_private.h
diff -u src/lib/libc/gen/nlist_private.h:1.20 src/lib/libc/gen/nlist_private.h:1.21
--- src/lib/libc/gen/nlist_private.h:1.20	Fri Sep 24 15:57:15 2010
+++ src/lib/libc/gen/nlist_private.h	Mon Jan 17 23:32:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_private.h,v 1.20 2010/09/24 15:57:15 matt Exp $ */
+/* $NetBSD: nlist_private.h,v 1.21 2011/01/17 23:32:31 matt Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou
@@ -43,9 +43,9 @@
 #elif defined(__mips__)
 #  define	NLIST_ECOFF
 #  define	NLIST_ELF32
-#ifndef __mips_o32
-#  define	NLIST_ELF64
-#endif
+#  ifndef __mips_o32
+#define	NLIST_ELF64
+#  endif
 #elif defined(__arm__) || defined(__i386__) || defined (__m68k__) || \
 defined(__powerpc__) || defined(__vax__)
 #  define	NLIST_AOUT

CVS commit: src/lib/libc/arch/mips/sys

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 23:34:44 UTC 2011

Modified Files:
src/lib/libc/arch/mips/sys: cerror.S

Log Message:
Make __cerror hidden.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/mips/sys/cerror.S

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/mips/sys/cerror.S
diff -u src/lib/libc/arch/mips/sys/cerror.S:1.15 src/lib/libc/arch/mips/sys/cerror.S:1.16
--- src/lib/libc/arch/mips/sys/cerror.S:1.15	Fri Sep  3 17:22:52 2010
+++ src/lib/libc/arch/mips/sys/cerror.S	Mon Jan 17 23:34:44 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cerror.S,v 1.15 2010/09/03 17:22:52 matt Exp $	*/
+/*	$NetBSD: cerror.S,v 1.16 2011/01/17 23:34:44 matt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -38,10 +38,14 @@
 #if 0
 	RCSID(from: @(#)cerror.s	8.1 (Berkeley) 6/16/93)
 #else
-	RCSID($NetBSD: cerror.S,v 1.15 2010/09/03 17:22:52 matt Exp $)
+	RCSID($NetBSD: cerror.S,v 1.16 2011/01/17 23:34:44 matt Exp $)
 #endif
 #endif /* LIBC_SCCS and not lint */
 
+#ifdef PIC
+	.hidden	__cerror
+#endif
+
 #ifdef _REENTRANT
 	.globl	_C_LABEL(__errno)
 NESTED_NOPROFILE(__cerror, CALLFRAME_SIZ, ra)

CVS commit: src

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 23:53:04 UTC 2011

Modified Files:
src/gnu/dist/gcc4/gcc/config/mips: netbsd64.h
src/lib/libc/arch/mips/gdtoa: Makefile.inc gd_qnan.h
src/lib/libc/arch/mips/gen: Makefile.inc
src/lib/libc/arch/mips/softfloat: softfloat.h
src/sys/arch/mips/include: float.h ieee.h math.h
Added Files:
src/lib/libc/gen: fpclassifyl_ieee754.c infinityl_ieee754.c
isfinitel_ieee754.c isinfl_ieee754.c isnanl_ieee754.c
signbitl_ieee754.c

Log Message:
Make the MIPS N32/N64 ABIs properly support 128-bit long doubles.  With this
change, we should be fully conformant with the N32 and N64 ABIs.
Add {fpclassify,infinity,isnan,ininf,signbit}l_ieee754.c back to lib/libc/gen.
Note that infinityl_ieee754.c will work with either 64-bit, 80-bit, or
128-bit long doubles.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gcc4/gcc/config/mips/netbsd64.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/mips/gdtoa/Makefile.inc \
src/lib/libc/arch/mips/gdtoa/gd_qnan.h
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/arch/mips/gen/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/mips/softfloat/softfloat.h
cvs rdiff -u -r0 -r1.1 src/lib/libc/gen/fpclassifyl_ieee754.c \
src/lib/libc/gen/infinityl_ieee754.c src/lib/libc/gen/isfinitel_ieee754.c \
src/lib/libc/gen/signbitl_ieee754.c
cvs rdiff -u -r0 -r1.4 src/lib/libc/gen/isinfl_ieee754.c
cvs rdiff -u -r0 -r1.6 src/lib/libc/gen/isnanl_ieee754.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/include/float.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/include/ieee.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/include/math.h

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

Modified files:

Index: src/gnu/dist/gcc4/gcc/config/mips/netbsd64.h
diff -u src/gnu/dist/gcc4/gcc/config/mips/netbsd64.h:1.2 src/gnu/dist/gcc4/gcc/config/mips/netbsd64.h:1.3
--- src/gnu/dist/gcc4/gcc/config/mips/netbsd64.h:1.2	Mon Dec 14 00:40:04 2009
+++ src/gnu/dist/gcc4/gcc/config/mips/netbsd64.h	Mon Jan 17 23:53:03 2011
@@ -50,9 +50,3 @@
%{mips32} %{mips32r2} %{mips64} %{mips64r2} \
%{bestGnum} %{call_shared} %{no_archive} %{exact_version} \
%(netbsd_link_spec)
-
-#undef LONG_DOUBLE_TYPE_SIZE
-#define LONG_DOUBLE_TYPE_SIZE 64
-
-#undef LIBGCC2_LONG_DOUBLE_TYPE_SIZE
-#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64

Index: src/lib/libc/arch/mips/gdtoa/Makefile.inc
diff -u src/lib/libc/arch/mips/gdtoa/Makefile.inc:1.1 src/lib/libc/arch/mips/gdtoa/Makefile.inc:1.2
--- src/lib/libc/arch/mips/gdtoa/Makefile.inc:1.1	Wed Mar 15 17:35:18 2006
+++ src/lib/libc/arch/mips/gdtoa/Makefile.inc	Mon Jan 17 23:53:03 2011
@@ -1,3 +1,10 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2011/01/17 23:53:03 matt Exp $
 
+CPUFLAGS?=
 SRCS+=	strtof.c
+.if (${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el)
+.if ${CPUFLAGS:M-mabi=32} == 
+SRCS+=	strtold_pQ.c
+SRCS+=	strtopQ.c
+.endif
+.endif
Index: src/lib/libc/arch/mips/gdtoa/gd_qnan.h
diff -u src/lib/libc/arch/mips/gdtoa/gd_qnan.h:1.1 src/lib/libc/arch/mips/gdtoa/gd_qnan.h:1.2
--- src/lib/libc/arch/mips/gdtoa/gd_qnan.h:1.1	Wed Jan 25 15:33:28 2006
+++ src/lib/libc/arch/mips/gdtoa/gd_qnan.h	Mon Jan 17 23:53:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
+/* $NetBSD: gd_qnan.h,v 1.2 2011/01/17 23:53:03 matt Exp $ */
 
 #include machine/endian.h
 
@@ -6,7 +6,15 @@
 #if BYTE_ORDER == BIG_ENDIAN
 #define d_QNAN0 0x7ff4
 #define d_QNAN1 0x0
+#define ld_QNAN0 0x7fff8000
+#define ld_QNAN1 0x0
+#define ld_QNAN2 0x0
+#define ld_QNAN3 0x0
 #else
 #define d_QNAN0 0x0
 #define d_QNAN1 0x7ff4
+#define ld_QNAN0 0x0
+#define ld_QNAN1 0x0
+#define ld_QNAN2 0x0
+#define ld_QNAN3 0x7fff8000
 #endif

Index: src/lib/libc/arch/mips/gen/Makefile.inc
diff -u src/lib/libc/arch/mips/gen/Makefile.inc:1.31 src/lib/libc/arch/mips/gen/Makefile.inc:1.32
--- src/lib/libc/arch/mips/gen/Makefile.inc:1.31	Fri Sep  3 17:22:51 2010
+++ src/lib/libc/arch/mips/gen/Makefile.inc	Mon Jan 17 23:53:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.31 2010/09/03 17:22:51 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.32 2011/01/17 23:53:03 matt Exp $
 
 .if ${MKSOFTFLOAT} == no
 SRCS+=	fabs.S ldexp.S modf.S
@@ -7,12 +7,12 @@
 .endif
 
 # Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
+SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_ieee754.c
+SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c fpclassifyl_ieee754.c
+SRCS+=	isinff_ieee754.c isinfd_ieee754.c isinfl_ieee754.c
+SRCS+=	isnanf_ieee754.c isnand_ieee754.c

CVS commit: src/distrib/amd64/cdroms

2011-01-17 Thread Jean-Yves Migeon

Module Name:src
Committed By:   jym
Date:   Tue Jan 18 00:16:14 UTC 2011

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/bootcd: Makefile boot.cfg.in
src/distrib/amd64/cdroms/bootcd-com: Makefile
src/distrib/amd64/cdroms/installcd: Makefile boot.cfg.in
Added Files:
src/distrib/amd64/cdroms: etc.rc etc.ttys install.sh

Log Message:
Bring amd64 installation ISO to same state as the i386 one:
- GENERIC kernel for booting
- root is now cd0a
- use the same scripts and conf files as the i386 install ISO.

See also http://mail-index.netbsd.org/port-i386/2011/01/14/msg002247.html


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/etc.rc \
src/distrib/amd64/cdroms/etc.ttys src/distrib/amd64/cdroms/install.sh
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/bootcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/bootcd/boot.cfg.in
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/cdroms/bootcd-com/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/installcd/boot.cfg.in

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

Modified files:

Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.1 src/distrib/amd64/cdroms/Makefile.cdrom:1.2
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.1	Tue Mar  6 21:52:44 2007
+++ src/distrib/amd64/cdroms/Makefile.cdrom	Tue Jan 18 00:16:13 2011
@@ -1,4 +1,69 @@
-# $NetBSD: Makefile.cdrom,v 1.1 2007/03/06 21:52:44 bouyer Exp $
+# $NetBSD: Makefile.cdrom,v 1.2 2011/01/18 00:16:13 jym Exp $
 
-CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot
-CDINSTKERNEL= ../../instkernel
+.include bsd.own.mk
+
+SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE}  ${PRINTOBJDIR}
+
+# Need multidot for the boot loader to read kernel modules as it doesn't
+# understand rockridge.
+CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
+CDINSTKERNEL=	../../instkernel
+CDKERNELS=	netbsd-GENERIC.gz   netbsd
+CDRELEASE_NOISOS=	true
+
+CDRUNTIME+=	./bin
+CDRUNTIME+=	./dev/MAKEDEV
+CDRUNTIME+=	./etc
+CDRUNTIME+=	./lib
+CDRUNTIME+=	./libdata
+CDRUNTIME+=	./libexec/ld.elf_so
+CDRUNTIME+=	./libexec/lfs_cleanerd
+CDRUNTIME+=	./libexec/dhcpcd-run-hooks
+CDRUNTIME+=	./libexec/resolvconf/
+CDRUNTIME+=	./mnt
+CDRUNTIME+=	./sbin
+CDRUNTIME+=	./stand
+CDRUNTIME+=	./tmp
+CDRUNTIME+=	./usr/bin/ftp
+CDRUNTIME+=	./usr/bin/grep
+CDRUNTIME+=	./usr/bin/gzip
+CDRUNTIME+=	./usr/bin/less
+CDRUNTIME+=	./usr/bin/more
+CDRUNTIME+=	./usr/bin/netstat
+CDRUNTIME+=	./usr/bin/progress
+CDRUNTIME+=	./usr/bin/sed
+CDRUNTIME+=	./usr/bin/sort
+CDRUNTIME+=	./usr/bin/tip
+CDRUNTIME+=	./usr/bin/vmstat
+CDRUNTIME+=	./usr/lib/libbz2.so*
+CDRUNTIME+=	./usr/lib/libc.so*
+CDRUNTIME+=	./usr/lib/libcurses.so*
+CDRUNTIME+=	./usr/lib/libedit.so*
+CDRUNTIME+=	./usr/lib/libintl.so*
+CDRUNTIME+=	./usr/lib/libkvm.so*
+CDRUNTIME+=	./usr/lib/libterminfo.so*
+CDRUNTIME+=	./usr/lib/libutil.so*
+CDRUNTIME+=	./usr/lib/libz.so*
+CDRUNTIME+=	./usr/libexec/ld.elf_so
+CDRUNTIME+=	./usr/libexec/getty
+CDRUNTIME+=	./usr/mdec
+CDRUNTIME+=	./usr/sbin/chroot
+CDRUNTIME+=	./usr/sbin/installboot
+CDRUNTIME+=	./usr/sbin/wiconfig
+CDRUNTIME+=	./usr/share/misc/terminfo.db
+CDRUNTIME+=	./usr/share/locale
+
+image_md_pre:
+	${MKDIR} cdrom/libexec/dhcpcd-hooks
+	${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
+	${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
+	${MKDIR} cdrom/etc
+	${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
+	${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
+	${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
+	${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
+	${MKDIR} cdrom/mnt2 cdrom/targetroot
+	${CP} ${SYSINSTDIR}/sysinst cdrom
+	${CHMOD} ugo+rx cdrom/sysinst
+	${CP} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+	${MKDIR} cdrom/var

Index: src/distrib/amd64/cdroms/bootcd/Makefile
diff -u src/distrib/amd64/cdroms/bootcd/Makefile:1.3 src/distrib/amd64/cdroms/bootcd/Makefile:1.4
--- src/distrib/amd64/cdroms/bootcd/Makefile:1.3	Wed Oct 22 11:59:24 2008
+++ src/distrib/amd64/cdroms/bootcd/Makefile	Tue Jan 18 00:16:13 2011
@@ -1,10 +1,9 @@
-#	$NetBSD: Makefile,v 1.3 2008/10/22 11:59:24 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.4 2011/01/18 00:16:13 jym Exp $
 #
 
 .include ${.CURDIR}/../Makefile.cdrom
 
 CDBASE=		boot			# gives ${CDBASE}.iso
-CDKERNELS=	netbsd-INSTALL.gz	netbsd	# from ../instkernel
 CDBUILDEXTRA+=	boot.cfg		# Add boot.cfg file
 CLEANFILES+=	boot.cfg
 

Index: src/distrib/amd64/cdroms/bootcd/boot.cfg.in
diff -u src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.2 src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.3
---

CVS commit: src/gnu/dist/gcc4/gcc/config/rs6000

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 00:19:28 UTC 2011

Modified Files:
src/gnu/dist/gcc4/gcc/config/rs6000: netbsd.h

Log Message:
Enable E500 (mpc85xx) support in GCC.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h

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

Modified files:

Index: src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h
diff -u src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.3 src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.4
--- src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.3	Sat May 13 10:38:33 2006
+++ src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h	Tue Jan 18 00:19:28 2011
@@ -121,6 +121,13 @@
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_STRICT_ALIGN)
 
+#undef TARGET_E500
+#undef TARGET_E500_SINGLE
+#undef TARGET_E500_DOUBLE
+#define TARGET_E500 (rs6000_cpu == PROCESSOR_PPC8540)
+#define TARGET_E500_SINGLE (TARGET_HARD_FLOAT  rs6000_float_gprs == 1)
+#define TARGET_E500_DOUBLE (TARGET_HARD_FLOAT  rs6000_float_gprs == 2)
+
 /* Attempt to enable execute permissions on the stack.  */
 #define TRANSFER_FROM_TRAMPOLINE NETBSD_ENABLE_EXECUTE_STACK
 #ifdef L_trampoline

CVS commit: src

2011-01-17 Thread Jean-Yves Migeon

Module Name:src
Committed By:   jym
Date:   Tue Jan 18 00:22:57 UTC 2011

Modified Files:
src/distrib/amd64: Makefile
src/distrib/amd64/instkernel: Makefile
src/etc/etc.amd64: Makefile.inc
Added Files:
src/distrib/amd64/kmod: Makefile

Log Message:
Build miniroot.kmod installation module for amd64. Hook GENERIC
with it.

See http://mail-index.netbsd.org/port-i386/2011/01/14/msg002247.html


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/instkernel/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/kmod/Makefile
cvs rdiff -u -r1.11 -r1.12 src/etc/etc.amd64/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/distrib/amd64/Makefile
diff -u src/distrib/amd64/Makefile:1.4 src/distrib/amd64/Makefile:1.5
--- src/distrib/amd64/Makefile:1.4	Tue Mar  6 21:52:44 2007
+++ src/distrib/amd64/Makefile	Tue Jan 18 00:22:56 2011
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.4 2007/03/06 21:52:44 bouyer Exp $
+#	$NetBSD: Makefile,v 1.5 2011/01/18 00:22:56 jym Exp $
 
 SUBDIR=
 SUBDIR+=	ramdisks
 SUBDIR+=	.WAIT
 SUBDIR+=	instkernel
+SUBDIR+=	kmod
 SUBDIR+=	.WAIT
 SUBDIR+=	cdroms
 SUBDIR+=	floppies

Index: src/distrib/amd64/instkernel/Makefile
diff -u src/distrib/amd64/instkernel/Makefile:1.3 src/distrib/amd64/instkernel/Makefile:1.4
--- src/distrib/amd64/instkernel/Makefile:1.3	Thu Nov 22 21:23:43 2007
+++ src/distrib/amd64/instkernel/Makefile	Tue Jan 18 00:22:56 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2007/11/22 21:23:43 bouyer Exp $
+#	$NetBSD: Makefile,v 1.4 2011/01/18 00:22:56 jym Exp $
 
 .include bsd.own.mk
 .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -13,10 +13,14 @@
 .endfor
 
 MDSETTARGETS=		INSTALL		${RAMDISK}	-
+MDSETTARGETS+=		GENERIC		${RAMDISK}	-
 MDSETTARGETS+=INSTALL_XEN3_DOMU		${RAMDISK}	-
 
 MDSET_RELEASEDIR=	binary/kernel
 
+# need symbols to load modules. don't actually want image inserted.
+MDSET_NOSTRIP.netbsd-GENERIC=
+MDSET_NOIMAGE.netbsd-GENERIC=
 # do not strip Xen kernels, there's no space constraints here.
 MDSET_NOSTRIP.netbsd-INSTALL_XEN3_DOMU=
 MDSET_NOSYMBOLS.netbsd-INSTALL_XEN3_DOMU=

Index: src/etc/etc.amd64/Makefile.inc
diff -u src/etc/etc.amd64/Makefile.inc:1.11 src/etc/etc.amd64/Makefile.inc:1.12
--- src/etc/etc.amd64/Makefile.inc:1.11	Tue Mar 18 04:20:36 2008
+++ src/etc/etc.amd64/Makefile.inc	Tue Jan 18 00:22:56 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.11 2008/03/18 04:20:36 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.12 2011/01/18 00:22:56 jym Exp $
 #
 #	etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
 #
@@ -14,9 +14,11 @@
 INSTALLATION_DIRS+= 	installation/cdrom
 INSTALLATION_DIRS+= 	installation/floppy
 INSTALLATION_DIRS+= 	installation/misc
+INSTALLATION_DIRS+= 	installation/miniroot
 
 snap_md_post:
 	cd ${KERNSRCDIR}/arch/i386/stand/pxeboot  ${MAKE} release
 	${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
 	${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
+	${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
 	${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'

Added files:

Index: src/distrib/amd64/kmod/Makefile
diff -u /dev/null src/distrib/amd64/kmod/Makefile:1.1
--- /dev/null	Tue Jan 18 00:22:57 2011
+++ src/distrib/amd64/kmod/Makefile	Tue Jan 18 00:22:56 2011
@@ -0,0 +1,27 @@
+#	$NetBSD: Makefile,v 1.1 2011/01/18 00:22:56 jym Exp $
+
+.include bsd.own.mk
+.include ../../common/Makefile.distrib
+
+MKMAN=		no
+PROG=		miniroot.kmod
+
+SRCMOD=		${DESTDIR}/stand/${MACHINE}/${DISTRIBVER}/modules/miniroot/miniroot.kmod
+DSTMOD=		${.OBJDIR}/miniroot.kmod
+RAMDISK=	ramdisk
+RAMDISKDIR!=	cd ${.CURDIR}/../ramdisks/${RAMDISK}  ${PRINTOBJDIR}
+RAMDISKFS=	${RAMDISKDIR}/${RAMDISK}.fs
+
+miniroot.kmod:	${RAMDISKFS} ${SRCMOD}
+		${OBJCOPY} --add-section miniroot=${RAMDISKFS} \
+		--set-section-flags miniroot=alloc,contents,load,data \
+		${SRCMOD} ${DSTMOD}.tmp
+		gzip -9nc  ${DSTMOD}.tmp  ${DSTMOD}
+		rm -f ${DSTMOD}.tmp
+
+.include bsd.prog.mk
+
+release:	miniroot.kmod
+		${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG}  \
+		${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/
+

CVS commit: src/sys/arch/sh3/include

2011-01-17 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jan 18 00:26:58 UTC 2011

Modified Files:
src/sys/arch/sh3/include: locore.h

Log Message:
Allow co-existance of traditional and modern CPP


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sh3/include/locore.h

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

Modified files:

Index: src/sys/arch/sh3/include/locore.h
diff -u src/sys/arch/sh3/include/locore.h:1.19 src/sys/arch/sh3/include/locore.h:1.20
--- src/sys/arch/sh3/include/locore.h:1.19	Sun Jun  1 00:46:01 2008
+++ src/sys/arch/sh3/include/locore.h	Tue Jan 18 00:26:57 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.h,v 1.19 2008/06/01 00:46:01 uwe Exp $	*/
+/*	$NetBSD: locore.h,v 1.20 2011/01/18 00:26:57 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -28,6 +28,21 @@
 
 #ifdef _LOCORE
 
+#ifdef __STDC__
+#if defined(SH3)  defined(SH4)
+#define	MOV(x, r)	mov.l .L_ ## x, r; mov.l @r, r
+#define	REG_SYMBOL(x)	.L_ ## x:	.long	_C_LABEL(__sh_ ## x)
+#define	FUNC_SYMBOL(x)	.L_ ## x:	.long	_C_LABEL(__sh_ ## x)
+#elif defined(SH3)
+#define	MOV(x, r)	mov.l .L_ ## x, r
+#define	REG_SYMBOL(x)	.L_ ## x:	.long	SH3_ ## x
+#define	FUNC_SYMBOL(x)	.L_ ## x:	.long	_C_LABEL(sh3_ ## x)
+#elif defined(SH4)
+#define	MOV(x, r)	mov.l .L_ ## x, r
+#define	REG_SYMBOL(x)	.L_ ## x:	.long	SH4_ ## x
+#define	FUNC_SYMBOL(x)	.L_ ## x:	.long	_C_LABEL(sh4_ ## x)
+#endif /* SH3  SH4 */
+#else /* !__STDC__ */
 #if defined(SH3)  defined(SH4)
 #define	MOV(x, r)	mov.l .L_/**/x, r; mov.l @r, r
 #define	REG_SYMBOL(x)	.L_/**/x:	.long	_C_LABEL(__sh_/**/x)
@@ -41,6 +56,7 @@
 #define	REG_SYMBOL(x)	.L_/**/x:	.long	SH4_/**/x
 #define	FUNC_SYMBOL(x)	.L_/**/x:	.long	_C_LABEL(sh4_/**/x)
 #endif /* SH3  SH4 */
+#endif /* __STDC__ */
 
 /*
  * BANK1 r6 contains current trapframe pointer.

CVS commit: src/distrib/notes/common

2011-01-17 Thread Jean-Yves Migeon

Module Name:src
Committed By:   jym
Date:   Tue Jan 18 00:35:20 UTC 2011

Modified Files:
src/distrib/notes/common: contents

Log Message:
XEN2 kernels are not part of the release any more. Support was removed
with NetBSD-6.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/distrib/notes/common/contents

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

Modified files:

Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.163 src/distrib/notes/common/contents:1.164
--- src/distrib/notes/common/contents:1.163	Mon Nov 15 21:39:53 2010
+++ src/distrib/notes/common/contents	Tue Jan 18 00:35:19 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: contents,v 1.163 2010/11/15 21:39:53 wiz Exp $
+.\	$NetBSD: contents,v 1.164 2011/01/18 00:35:19 jym Exp $
 .\
 .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -96,11 +96,8 @@
 A version of
 .Li INSTALL
 for older machines without CD-ROM drives.
-.			It Pa netbsd-INSTALL_XEN2_DOMU.gz
 .			It Pa netbsd-INSTALL_XEN3PAE_DOMU.gz
 .			It Pa netbsd-INSTALL_XEN3_DOMU.gz
-.			It Pa netbsd-XEN2_DOM0.gz
-.			It Pa netbsd-XEN2_DOMU.gz
 .			It Pa netbsd-XEN3PAE_DOMU.gz
 .			It Pa netbsd-XEN3_DOM0.gz
 .			It Pa netbsd-XEN3_DOMU.gz

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

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 01:07:06 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: PMPPC
Added Files:
src/sys/arch/evbppc/conf: INSTALL_PMPPC

Log Message:
Add TMPFS and ksyms.  Add an INSTALL variant


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2 src/sys/arch/evbppc/conf/INSTALL_PMPPC
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/conf/PMPPC

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/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.17 src/sys/arch/evbppc/conf/PMPPC:1.18
--- src/sys/arch/evbppc/conf/PMPPC:1.17	Tue Nov 23 11:13:57 2010
+++ src/sys/arch/evbppc/conf/PMPPC	Tue Jan 18 01:07:06 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: PMPPC,v 1.17 2010/11/23 11:13:57 hannken Exp $
+#	$NetBSD: PMPPC,v 1.18 2011/01/18 01:07:06 matt Exp $
 #
 #	PMPPC
 #
@@ -33,7 +33,7 @@
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=524288	# size for embedded symbol table
+options 	SYMTAB_SPACE=58	# size for embedded symbol table
 
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME=\com\,KGDB_DEVADDR=0xff600400,KGDB_DEVRATE=9600
@@ -71,13 +71,14 @@
 file-system 	OVERLAY		# overlay file system
 file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g  sshfs)
 file-system 	PROCFS		# /proc
+file-system 	TMPFS		# efficient memory file system
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
 #options 	QUOTA		# UFS quotas
-#options 	FFS_EI		# FFS Endian Independant support
+options 	FFS_EI		# FFS Endian Independant support
 options 	WAPBL		# File system journaling support - Experimental
 #options 	NFSSERVER	# Network File System server
 #options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
@@ -451,6 +452,7 @@
 pseudo-device	rnd			# /dev/random and in-kernel generator
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	putter			# for puffs and pud
+pseudo-device	ksyms
 
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse  keyboard multiplexor

Added files:

Index: src/sys/arch/evbppc/conf/INSTALL_PMPPC
diff -u /dev/null src/sys/arch/evbppc/conf/INSTALL_PMPPC:1.2
--- /dev/null	Tue Jan 18 01:07:06 2011
+++ src/sys/arch/evbppc/conf/INSTALL_PMPPC	Tue Jan 18 01:07:06 2011
@@ -0,0 +1,26 @@
+# 	$NetBSD: INSTALL_PMPPC,v 1.2 2011/01/18 01:07:06 matt Exp $
+
+include arch/evbppc/conf/PMPPC
+
+#ident 		INSTALL_PMPPC-$Revision: 1.2 $
+
+# DEBUG options turned on:
+
+options		PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
+
+pseudo-device	md
+
+makeoptions	NEEDS_MDSETIMAGE=yes
+
+no config	netbsd
+config		netbsd root on md0a
+
+# Enable the hooks used for initializing the root memory-disk.
+options 	MEMORY_DISK_HOOKS
+options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
+options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
+## The ramdisk size must be kept in sync manually with the size of
+## the `ramdisk' image (which is built in distrib/evbppc/ramdisk/ramdisk).
+options 	MEMORY_DISK_ROOT_SIZE=6144	# size of memory disk, in blocks
+options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
+

CVS commit: src/sys/arch/evbppc/obs405

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 01:08:55 UTC 2011

Modified Files:
src/sys/arch/evbppc/obs405: rbus_machdep.c

Log Message:
include uvm/uvm_extern.h


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/obs405/rbus_machdep.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/evbppc/obs405/rbus_machdep.c
diff -u src/sys/arch/evbppc/obs405/rbus_machdep.c:1.5 src/sys/arch/evbppc/obs405/rbus_machdep.c:1.6
--- src/sys/arch/evbppc/obs405/rbus_machdep.c:1.5	Tue Jan  4 11:41:24 2011
+++ src/sys/arch/evbppc/obs405/rbus_machdep.c	Tue Jan 18 01:08:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbus_machdep.c,v 1.5 2011/01/04 11:41:24 kiyohara Exp $	*/
+/*	$NetBSD: rbus_machdep.c,v 1.6 2011/01/18 01:08:55 matt Exp $	*/
 
 /*
  * Copyright (c) 2003
@@ -33,6 +33,8 @@
 
 #include sys/extent.h
 
+#include uvm/uvm_extern.h
+
 #include machine/bus.h
 
 #include dev/pci/pcivar.h

CVS commit: src/sys/compat/linux/arch/powerpc

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 01:13:04 UTC 2011

Modified Files:
src/sys/compat/linux/arch/powerpc: linux_machdep.c

Log Message:
Deal with changes in the trapframe.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/linux/arch/powerpc/linux_machdep.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/compat/linux/arch/powerpc/linux_machdep.c
diff -u src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.43 src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.44
--- src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.43	Fri Jan 14 02:06:33 2011
+++ src/sys/compat/linux/arch/powerpc/linux_machdep.c	Tue Jan 18 01:13:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.43 2011/01/14 02:06:33 rmind Exp $ */
+/*	$NetBSD: linux_machdep.c,v 1.44 2011/01/18 01:13:03 matt Exp $ */
 
 /*-
  * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_machdep.c,v 1.43 2011/01/14 02:06:33 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_machdep.c,v 1.44 2011/01/18 01:13:03 matt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -140,7 +140,7 @@
 		((char *)l-l_sigstk.ss_sp +
 		l-l_sigstk.ss_size);
 	} else {
-		fp = tf-fixreg[1];
+		fp = tf-tf_fixreg[1];
 	}
 #ifdef DEBUG_LINUX
 	printf(fp at start of linux_sendsig = %x\n, fp);
@@ -164,18 +164,18 @@
 	 * Save register context.
 	 */
 	for (i = 0; i  32; i++)
-		linux_regs.lgpr[i] = tf-fixreg[i];
-	linux_regs.lnip = tf-srr0;
-	linux_regs.lmsr = tf-srr1  PSL_USERSRR1;
-	linux_regs.lorig_gpr3 = tf-fixreg[3]; /* XXX Is that right? */
-	linux_regs.lctr = tf-ctr;
-	linux_regs.llink = tf-lr;
-	linux_regs.lxer = tf-xer;
-	linux_regs.lccr = tf-cr;
+		linux_regs.lgpr[i] = tf-tf_fixreg[i];
+	linux_regs.lnip = tf-tf_srr0;
+	linux_regs.lmsr = tf-tf_srr1  PSL_USERSRR1;
+	linux_regs.lorig_gpr3 = tf-tf_fixreg[3]; /* XXX Is that right? */
+	linux_regs.lctr = tf-tf_ctr;
+	linux_regs.llink = tf-tf_lr;
+	linux_regs.lxer = tf-tf_xer;
+	linux_regs.lccr = tf-tf_cr;
 	linux_regs.lmq = 0;  			/* Unused, 601 only */
-	linux_regs.ltrap = tf-exc;
-	linux_regs.ldar = tf-dar;
-	linux_regs.ldsisr = tf-dsisr;
+	linux_regs.ltrap = tf-tf_exc;
+	linux_regs.ldar = tf-tf_dar;
+	linux_regs.ldsisr = tf-tf_dsisr;
 	linux_regs.lresult = 0;
 
 	memset(frame, 0, sizeof(frame));
@@ -232,11 +232,11 @@
 	 * Set the registers according to how the Linux process expects them.
 	 * Mind the gap Linux expects a gap here.
 	 */
-	tf-fixreg[1] = fp - LINUX__SIGNAL_FRAMESIZE;
-	tf-lr = (int)catcher;
-	tf-fixreg[3] = (int)native_to_linux_signo[sig];
-	tf-fixreg[4] = fp;
-	tf-srr0 = (int)p-p_sigctx.ps_sigcode;
+	tf-tf_fixreg[1] = fp - LINUX__SIGNAL_FRAMESIZE;
+	tf-tf_lr = (int)catcher;
+	tf-tf_fixreg[3] = (int)native_to_linux_signo[sig];
+	tf-tf_fixreg[4] = fp;
+	tf-tf_srr0 = (int)p-p_sigctx.ps_sigcode;
 
 #ifdef DEBUG_LINUX
 	printf(fp at end of linux_sendsig = %x\n, fp);
@@ -308,13 +308,13 @@
 		return (EINVAL);
 
 	for (i = 0; i  32; i++)
-		tf-fixreg[i] = lregs-lgpr[i];
-	tf-lr = lregs-llink;
-	tf-cr = lregs-lccr;
-	tf-xer = lregs-lxer;
-	tf-ctr = lregs-lctr;
-	tf-srr0 = lregs-lnip;
-	tf-srr1 = lregs-lmsr;
+		tf-tf_fixreg[i] = lregs-lgpr[i];
+	tf-tf_lr = lregs-llink;
+	tf-tf_cr = lregs-lccr;
+	tf-tf_xer = lregs-lxer;
+	tf-tf_ctr = lregs-lctr;
+	tf-tf_srr0 = lregs-lnip;
+	tf-tf_srr1 = lregs-lmsr;
 
 	/*
 	 * Make sure the fpu state is discarded
@@ -398,13 +398,13 @@
 		return (EINVAL);
 
 	for (i = 0; i  32; i++)
-		tf-fixreg[i] = lregs-lgpr[i];
-	tf-lr = lregs-llink;
-	tf-cr = lregs-lccr;
-	tf-xer = lregs-lxer;
-	tf-ctr = lregs-lctr;
-	tf-srr0 = lregs-lnip;
-	tf-srr1 = lregs-lmsr;
+		tf-tf_fixreg[i] = lregs-lgpr[i];
+	tf-tf_lr = lregs-llink;
+	tf-tf_cr = lregs-lccr;
+	tf-tf_xer = lregs-lxer;
+	tf-tf_ctr = lregs-lctr;
+	tf-tf_srr0 = lregs-lnip;
+	tf-tf_srr1 = lregs-lmsr;
 
 	/*
 	 * Make sure the fpu state is discarded

CVS commit: src/sys/common/pmap/tlb

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 01:20:06 UTC 2011

Modified Files:
src/sys/common/pmap/tlb: pmap.c

Log Message:
Remove forced DEBUG.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/common/pmap/tlb/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/common/pmap/tlb/pmap.c
diff -u src/sys/common/pmap/tlb/pmap.c:1.2 src/sys/common/pmap/tlb/pmap.c:1.3
--- src/sys/common/pmap/tlb/pmap.c:1.2	Tue Jan 18 01:11:50 2011
+++ src/sys/common/pmap/tlb/pmap.c	Tue Jan 18 01:20:06 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.2 2011/01/18 01:11:50 matt Exp $	*/
+/*	$NetBSD: pmap.c,v 1.3 2011/01/18 01:20:06 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.2 2011/01/18 01:11:50 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.3 2011/01/18 01:20:06 matt Exp $);
 
 /*
  *	Manages physical address maps.
@@ -113,8 +113,6 @@
 
 #include uvm/uvm.h
 
-#define DEBUG 1
-
 #define	PMAP_COUNT(name)	(pmap_evcnt_##name.ev_count++ + 0)
 #define PMAP_COUNTER(name, desc) \
 static struct evcnt pmap_evcnt_##name = \

CVS commit: src/lib/libc/arch/powerpc

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 01:23:24 UTC 2011

Modified Files:
src/lib/libc/arch/powerpc: genassym.cf

Log Message:
Change to deal with callframe changes


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/powerpc/genassym.cf

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/powerpc/genassym.cf
diff -u src/lib/libc/arch/powerpc/genassym.cf:1.2 src/lib/libc/arch/powerpc/genassym.cf:1.3
--- src/lib/libc/arch/powerpc/genassym.cf:1.2	Sat Jan 15 07:31:12 2011
+++ src/lib/libc/arch/powerpc/genassym.cf	Tue Jan 18 01:23:24 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.2 2011/01/15 07:31:12 matt Exp $
+#	$NetBSD: genassym.cf,v 1.3 2011/01/18 01:23:24 matt Exp $
 
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -36,9 +36,9 @@
 include machine/frame.h
 
 define CALLFRAMELEN	sizeof(struct callframe)
-define CALLFRAME_LR	offsetof(struct callframe, lr)
-define CALLFRAME_R30	offsetof(struct callframe, r30)
-define CALLFRAME_R31	offsetof(struct callframe, r31)
+define CALLFRAME_LR	offsetof(struct callframe, cf_lr)
+define CALLFRAME_R30	offsetof(struct callframe, cf_r30)
+define CALLFRAME_R31	offsetof(struct callframe, cf_r31)
 
 define UC_GREGS_R1	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_R1])
 define UC_GREGS_R3	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_R3])

CVS commit: src/distrib/evbppc/ramdisk

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 01:25:29 UTC 2011

Modified Files:
src/distrib/evbppc/ramdisk: Makefile

Log Message:
Don't use string instructions (not on mpc85xx)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/evbppc/ramdisk/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/evbppc/ramdisk/Makefile
diff -u src/distrib/evbppc/ramdisk/Makefile:1.8 src/distrib/evbppc/ramdisk/Makefile:1.9
--- src/distrib/evbppc/ramdisk/Makefile:1.8	Thu Feb 11 09:06:48 2010
+++ src/distrib/evbppc/ramdisk/Makefile	Tue Jan 18 01:25:29 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2010/02/11 09:06:48 roy Exp $
+#	$NetBSD: Makefile,v 1.9 2011/01/18 01:25:29 matt Exp $
 
 .include bsd.own.mk
 .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@
 MAKEFS_FLAGS=	-f 15
 
 WARNS=		1
-DBG=		-Os -mmultiple -mstring
+DBG=		-Os -mmultiple -mno-string
 
 CRUNCHBIN=	ramdiskbin
 CRUNCHGEN_FLAGS=-d ${DBG}

CVS commit: src/distrib/evbppc/ramdisk

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 01:27:16 UTC 2011

Modified Files:
src/distrib/evbppc/ramdisk: dot.profile list

Log Message:
Switch to using tmpfs.
Add mount_tmpfs, ps, netstat, vmstat, and date to ramdisk image.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/evbppc/ramdisk/dot.profile
cvs rdiff -u -r1.15 -r1.16 src/distrib/evbppc/ramdisk/list

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

Modified files:

Index: src/distrib/evbppc/ramdisk/dot.profile
diff -u src/distrib/evbppc/ramdisk/dot.profile:1.2 src/distrib/evbppc/ramdisk/dot.profile:1.3
--- src/distrib/evbppc/ramdisk/dot.profile:1.2	Sat Jul 26 17:06:41 2003
+++ src/distrib/evbppc/ramdisk/dot.profile	Tue Jan 18 01:27:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.2 2003/07/26 17:06:41 salo Exp $
+# $NetBSD: dot.profile,v 1.3 2011/01/18 01:27:16 matt Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -53,8 +53,8 @@
 	# mount root read-write
 	mount -u /dev/md0a /
 
-	# mount a /tmp on mfs, to avoid filling the md
-	mount -t mfs swap /tmp
+	# mount a /tmp on tmpfs, to avoid filling the md
+	mount_tmpfs tmpfs /tmp
 
 	# get the terminal type
 	_forceloop=

Index: src/distrib/evbppc/ramdisk/list
diff -u src/distrib/evbppc/ramdisk/list:1.15 src/distrib/evbppc/ramdisk/list:1.16
--- src/distrib/evbppc/ramdisk/list:1.15	Fri Jan 14 10:26:31 2011
+++ src/distrib/evbppc/ramdisk/list	Tue Jan 18 01:27:16 2011
@@ -1,10 +1,11 @@
-#	$NetBSD: list,v 1.15 2011/01/14 10:26:31 tsutsui Exp $
+#	$NetBSD: list,v 1.16 2011/01/18 01:27:16 matt Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
 PROG	bin/cat
 PROG	bin/chmod
 PROG	bin/cp
+PROG	bin/date
 PROG	bin/dd
 PROG	bin/df
 PROG	bin/ed
@@ -15,6 +16,7 @@
 PROG	bin/mv
 PROG	bin/pax		usr/bin/tar
 PROG	bin/pwd
+PROG	bin/ps
 PROG	bin/rcmd
 PROG	bin/rcp
 PROG	bin/rm
@@ -33,7 +35,7 @@
 PROG	sbin/mount
 PROG	sbin/mount_cd9660
 PROG	sbin/mount_ffs
-PROG	sbin/mount_msdos
+PROG	sbin/mount_tmpfs
 PROG	sbin/mount_nfs
 PROG	sbin/newfs	sbin/mount_mfs
 PROG	sbin/ping
@@ -49,6 +51,8 @@
 PROG	usr/bin/more
 PROG	usr/bin/sed
 PROG	usr/bin/tset
+PROG	usr/bin/vmstat
+PROG	usr/bin/netstat
 
 PROG	usr/sbin/chroot
 
@@ -63,7 +67,7 @@
 SPECIAL	route		srcdir	distrib/utils/x_route
 SPECIAL	umount		srcdir	distrib/utils/x_umount
 
-LIBS	libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop
+LIBS	libhack.o -ledit -lutil -lcurses -lterminfo -lkvm -lrmt -ll -lm -lz -lprop
 
 # various files that we need in /etc for the install
 COPY	${NETBSDSRCDIR}/etc/group		etc/group

CVS commit: src/gnu/dist/gdb6/gdb

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 01:28:19 UTC 2011

Modified Files:
src/gnu/dist/gdb6/gdb: ppcnbsd-nat.c

Log Message:
Change to reflect switchframe/callframe changes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gdb6/gdb/ppcnbsd-nat.c

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

Modified files:

Index: src/gnu/dist/gdb6/gdb/ppcnbsd-nat.c
diff -u src/gnu/dist/gdb6/gdb/ppcnbsd-nat.c:1.2 src/gnu/dist/gdb6/gdb/ppcnbsd-nat.c:1.3
--- src/gnu/dist/gdb6/gdb/ppcnbsd-nat.c:1.2	Wed Dec  6 18:25:29 2006
+++ src/gnu/dist/gdb6/gdb/ppcnbsd-nat.c	Tue Jan 18 01:28:19 2011
@@ -157,20 +157,20 @@
 return 0;
 
   read_memory (pcb-pcb_sp, (gdb_byte *)sf, sizeof sf);
-  regcache_raw_supply (regcache, tdep-ppc_cr_regnum, sf.cr);
-  regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 2, sf.fixreg2);
+  regcache_raw_supply (regcache, tdep-ppc_cr_regnum, sf.sf_cr);
+  regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 2, sf.sf_fixreg2);
   for (i = 0 ; i  19 ; i++)
 regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 13 + i,
-			 sf.fixreg[i]);
+			 sf.sf_fixreg[i]);
 
-  read_memory(sf.sp, (gdb_byte *)cf, sizeof(cf));
-  regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 30, cf.r30);
-  regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 31, cf.r31);
-  regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 1, cf.sp);
-
-  read_memory(cf.sp, (gdb_byte *)cf, sizeof(cf));
-  regcache_raw_supply (regcache, tdep-ppc_lr_regnum, cf.lr);
-  regcache_raw_supply (regcache, PC_REGNUM, cf.lr);
+  read_memory(sf.sf_sp, (gdb_byte *)cf, sizeof(cf));
+  regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 30, cf.cf_r30);
+  regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 31, cf.cf_r31);
+  regcache_raw_supply (regcache, tdep-ppc_gp0_regnum + 1, cf.cf_sp);
+
+  read_memory(cf.cf_sp, (gdb_byte *)cf, sizeof(cf));
+  regcache_raw_supply (regcache, tdep-ppc_lr_regnum, cf.cf_lr);
+  regcache_raw_supply (regcache, PC_REGNUM, cf.cf_lr);
 
   return 1;
 }

CVS commit: src/sys/arch/powerpc

2011-01-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Jan 18 02:25:43 UTC 2011

Modified Files:
src/sys/arch/powerpc/oea: altivec.c cpu_subr.c oea_machdep.c
src/sys/arch/powerpc/pic: ipi.c
src/sys/arch/powerpc/powerpc: fpu.c

Log Message:
Fix some fallout from building the macppc GENERIC.MP.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/oea/altivec.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/pic/ipi.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/powerpc/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/powerpc/oea/altivec.c
diff -u src/sys/arch/powerpc/oea/altivec.c:1.18 src/sys/arch/powerpc/oea/altivec.c:1.19
--- src/sys/arch/powerpc/oea/altivec.c:1.18	Tue Jan 18 01:02:55 2011
+++ src/sys/arch/powerpc/oea/altivec.c	Tue Jan 18 02:25:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: altivec.c,v 1.18 2011/01/18 01:02:55 matt Exp $	*/
+/*	$NetBSD: altivec.c,v 1.19 2011/01/18 02:25:42 matt Exp $	*/
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: altivec.c,v 1.18 2011/01/18 01:02:55 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: altivec.c,v 1.19 2011/01/18 02:25:42 matt Exp $);
 
 #include opt_multiprocessor.h
 
@@ -183,7 +183,7 @@
 
 	panic(%s/%d timed out: pid = %d.%d, veccpu-ci_cpuid = %d\n,
 	__func__, cpu_number(), l-l_proc-p_pid, l-l_lid,
-	veccpu-ci_cpuid);
+	l-l_md.md_veccpu-ci_cpuid);
 }
 #endif /*MULTIPROCESSOR*/
 

Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.60 src/sys/arch/powerpc/oea/cpu_subr.c:1.61
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.60	Tue Jan 18 01:02:55 2011
+++ src/sys/arch/powerpc/oea/cpu_subr.c	Tue Jan 18 02:25:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_subr.c,v 1.60 2011/01/18 01:02:55 matt Exp $	*/
+/*	$NetBSD: cpu_subr.c,v 1.61 2011/01/18 02:25:42 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.60 2011/01/18 01:02:55 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.61 2011/01/18 02:25:42 matt Exp $);
 
 #include opt_ppcparam.h
 #include opt_multiprocessor.h
@@ -51,6 +51,7 @@
 
 #include uvm/uvm.h
 
+#include powerpc/pcb.h
 #include powerpc/spr.h
 #include powerpc/oea/hid.h
 #include powerpc/oea/hid_601.h
@@ -1183,31 +1184,12 @@
 	volatile struct cpu_hatch_data hatch_data, *h = hatch_data;
 	struct pglist mlist;
 	int i, error, pvr, vers;
-	char *cp, *hp;
+	char *hp;
 
 	pvr = mfpvr();
 	vers = pvr  16;
 	KASSERT(ci != curcpu());
 
-	/*
-	 * Allocate some contiguous pages for the intteup PCB and stack
-	 * from the lowest 256MB (because bat0 always maps it va == pa).
-	 * Must be 16 byte aligned.
-	 */
-	error = uvm_pglistalloc(INTSTK, 0x1, 0x1000, 16, 0,
-	mlist, 1, 1);
-	if (error) {
-		aprint_error(: unable to allocate idle stack\n);
-		return -1;
-	}
-
-	KASSERT(ci != cpu_info[0]);
-
-	cp = (void *)VM_PAGE_TO_PHYS(TAILQ_FIRST(mlist));
-	memset(cp, 0, INTSTK);
-
-	ci-ci_intstk = cp;
-
 	/* Now allocate a hatch stack */
 	error = uvm_pglistalloc(0x1000, 0x1, 0x1000, 16, 0,
 	mlist, 1, 1);

Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.55 src/sys/arch/powerpc/oea/oea_machdep.c:1.56
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.55	Tue Jan 18 01:02:55 2011
+++ src/sys/arch/powerpc/oea/oea_machdep.c	Tue Jan 18 02:25:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: oea_machdep.c,v 1.55 2011/01/18 01:02:55 matt Exp $	*/
+/*	$NetBSD: oea_machdep.c,v 1.56 2011/01/18 02:25:42 matt Exp $	*/
 
 /*
  * Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: oea_machdep.c,v 1.55 2011/01/18 01:02:55 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: oea_machdep.c,v 1.56 2011/01/18 02:25:42 matt Exp $);
 
 #include opt_ppcarch.h
 #include opt_compat_netbsd.h
@@ -150,6 +150,7 @@
 	/*
 	 * Initialize proc0 and current pcb and pmap pointers.
 	 */
+	(void) ci;
 	KASSERT(ci != NULL);
 	KASSERT(curcpu() == ci);
 	KASSERT(lwp0.l_cpu == ci);

Index: src/sys/arch/powerpc/pic/ipi.c
diff -u src/sys/arch/powerpc/pic/ipi.c:1.6 src/sys/arch/powerpc/pic/ipi.c:1.7
--- src/sys/arch/powerpc/pic/ipi.c:1.6	Fri Jun 25 19:00:05 2010
+++ src/sys/arch/powerpc/pic/ipi.c	Tue Jan 18 02:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi.c,v 1.6 2010/06/25 19:00:05 rmind Exp $ */
+/* $NetBSD: ipi.c,v 1.7 2011/01/18 02:25:42 matt Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipi.c,v 1.6 2010/06/25 19:00:05 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipi.c,v 1.7 2011/01/18 02:25:42 matt Exp $);

CVS commit: src/sys/arch/x86/x86

2011-01-17 Thread Julio Merino

Module Name:src
Committed By:   jmmv
Date:   Tue Jan 18 07:47:17 UTC 2011

Modified Files:
src/sys/arch/x86/x86: platform.c

Log Message:
Ammend previous to be more accurate in platform_add_date by using the epoch:
* Years in the [70,99] range are considered to be in 1900.
* Years in the [0,69] range are considered to be in 2000.

I don't think we may have hit any machine where the previous numbers were
a problem, but these seem to be the correct ones.

From christos@.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/x86/platform.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/platform.c
diff -u src/sys/arch/x86/x86/platform.c:1.10 src/sys/arch/x86/x86/platform.c:1.11
--- src/sys/arch/x86/x86/platform.c:1.10	Mon Jan 17 22:21:25 2011
+++ src/sys/arch/x86/x86/platform.c	Tue Jan 18 07:47:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.c,v 1.10 2011/01/17 22:21:25 jmmv Exp $ */
+/* $NetBSD: platform.c,v 1.11 2011/01/18 07:47:16 jmmv Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
 #include isa.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: platform.c,v 1.10 2011/01/17 22:21:25 jmmv Exp $);
+__KERNEL_RCSID(0, $NetBSD: platform.c,v 1.11 2011/01/18 07:47:16 jmmv Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -167,7 +167,7 @@
 		return;
 	if (year  )
 		return;
-	if (year  90)
+	if (year  70)
 		year += 2000;
 	else if (year  100)
 		year += 1900;

62 matches

Mail list logo