Re: CVS commit: src/sys/arch/sandpoint/stand/altboot

2011-10-31 Thread David Laight
On Sun, Oct 30, 2011 at 09:08:33PM +, Frank Wille wrote:
 Module Name:  src
 Committed By: phx
 Date: Sun Oct 30 21:08:33 UTC 2011
 
 Modified Files:
   src/sys/arch/sandpoint/stand/altboot: brdsetup.c dsk.c entry.S fxp.c
   globals.h nvt.c rge.c skg.c stg.c vge.c
 
 Log Message:
 Added in8() and out8() to access a byte with reorder-protection.
 Use it in all drivers instead of (volatile uint8_t *).

This isn't really an ideal solution, I've have to fight membar
instructions embedded into byteswapping accesses on ppc linux.
Drivers may want to do several accesses that can be reordered
before/after one that matters - so need greater control than
enforcing specific membars.

David

-- 
David Laight: da...@l8s.co.uk


Re: CVS commit: src/sys/arch/sandpoint/stand/altboot

2011-10-31 Thread Frank Wille
David Laight wrote:

 This isn't really an ideal solution, I've have to fight membar
 instructions embedded into byteswapping accesses on ppc linux.
 Drivers may want to do several accesses that can be reordered
 before/after one that matters - so need greater control than
 enforcing specific membars.

Hm. What would you suggest? Is it better to revert this change?

If it is only a matter of performance, I would prefer a slower driver
with increased stability. This is just the boot loader, which reads from
disks with PIO0.

-- 
Frank Wille


Re: CVS commit: src/sys/arch/m68k

2011-10-31 Thread Izumi Tsutsui
 is a nointr pool safe for this pmap?

I could be stupid in this area.

 iirc x86 pmap allocates pv entries from kmem_map to avoid this kind of
 recursion.

I see, but x86 pmap has been changed to use pool_cache(9) with
pool_allocator_meta during vmlocking merge.
http://cvsweb.NetBSD.org/bsdweb.cgi/src/sys/arch/x86/x86/pmap.c.diff?r1=1.2r2=1.3

Is it enough to use pool(9) with pool_allocator_meta (which uses kmem_map),
or should I revert that pool change and just make uvm_km_alloc() in
old pmap_alloc_pv() use kmem_map instead of kernel_map?

---
Izumi Tsutsui


Re: CVS commit: src/sys/arch/m68k

2011-10-31 Thread YAMAMOTO Takashi
hi,

 is a nointr pool safe for this pmap?
 
 I could be stupid in this area.
 
 iirc x86 pmap allocates pv entries from kmem_map to avoid this kind of
 recursion.
 
 I see, but x86 pmap has been changed to use pool_cache(9) with
 pool_allocator_meta during vmlocking merge.
 http://cvsweb.NetBSD.org/bsdweb.cgi/src/sys/arch/x86/x86/pmap.c.diff?r1=1.2r2=1.3
 
 Is it enough to use pool(9) with pool_allocator_meta (which uses kmem_map),
 or should I revert that pool change and just make uvm_km_alloc() in
 old pmap_alloc_pv() use kmem_map instead of kernel_map?

although i'm not familiar with this pmap, i think pool_allocator_meta is ok.

YAMAMOTO Takashi

 
 ---
 Izumi Tsutsui


Re: CVS commit: src/distrib/utils/sysinst

2011-10-31 Thread Greg Troxel

  If TNF can provide a open resolver on a stable IPv6 address for use
  by sysinst, that'd be great.

Do we need only a resolver that answers for things in netbsd.org, to
find mirrors, or really a full resolver?


pgpkxsOKL8CZH.pgp
Description: PGP signature


Re: CVS commit: src/distrib/utils/sysinst

2011-10-31 Thread Jonathan A. Kollasch
On Mon, Oct 31, 2011 at 11:40:25AM -0400, Greg Troxel wrote:
 
   If TNF can provide a open resolver on a stable IPv6 address for use
   by sysinst, that'd be great.
 
 Do we need only a resolver that answers for things in netbsd.org, to
 find mirrors, or really a full resolver?

Depends, I often will install sets I've built myself from a random
server.  But adding a server (preferably further down the
list) that only answers for netbsd.org might be a option some people
would prefer to use.

Jonathan Kollasch


Re: CVS commit: src/distrib/utils/sysinst

2011-10-31 Thread Martin Husemann
On Mon, Oct 31, 2011 at 03:45:05PM +, Jonathan A. Kollasch wrote:
 Depends, I often will install sets I've built myself from a random
 server.  But adding a server (preferably further down the
 list) that only answers for netbsd.org might be a option some people
 would prefer to use.

I wonder if we should add another option to use the ipv6 default gateway
as nameserver and otherwise declare this a convenience option for a
real world corner case most users won't run into (and not realy care
about the actual resolvers used in that case).

Martin
(but hey, I'm living in a mostly v6 free world still, despite realy
hard trying to change that)


CVS commit: src

2011-10-31 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Oct 31 08:14:44 UTC 2011

Modified Files:
src/distrib/sets: mkvars.mk
src/external/gpl3: Makefile
src/share/mk: bsd.own.mk
src/tools/binutils: Makefile
src/tools/dbsym: Makefile
src/tools/mdsetimage: Makefile

Log Message:
obsolete now useless (and wrongly set to 219 :-) HAVE_BINUTILS.
switch the sense of the gdb and gcc tests to list the platforms not
switched to gcc 4.5 or gdb 7, which is now:

GCC 4.1:
.if ${MACHINE_ARCH} == alpha  || \
${MACHINE_CPU}  == arm|| \
${MACHINE_CPU}  == m68k   || \
${MACHINE_CPU}  == vax

GDB 6:
.if ${MACHINE_ARCH} == alpha  || \
${MACHINE_ARCH} == hppa   || \
${MACHINE_CPU}  == mips   || \
${MACHINE_CPU}  == sh3|| \
${MACHINE_ARCH} == vax

let's go, people!  (-:


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/Makefile
cvs rdiff -u -r1.687 -r1.688 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.20 -r1.21 src/tools/binutils/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tools/dbsym/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tools/mdsetimage/Makefile

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

Modified files:

Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.4 src/distrib/sets/mkvars.mk:1.5
--- src/distrib/sets/mkvars.mk:1.4	Tue Dec 28 09:15:24 2010
+++ src/distrib/sets/mkvars.mk	Mon Oct 31 08:14:43 2011
@@ -1,10 +1,9 @@
-# $NetBSD: mkvars.mk,v 1.4 2010/12/28 09:15:24 he Exp $
+# $NetBSD: mkvars.mk,v 1.5 2011/10/31 08:14:43 mrg Exp $
 
 MKEXTRAVARS= \
 	MACHINE \
 	MACHINE_ARCH \
 	MACHINE_CPU \
-	HAVE_BINUTILS \
 	HAVE_GCC \
 	HAVE_GDB \
 	HAS_SSP \

Index: src/external/gpl3/Makefile
diff -u src/external/gpl3/Makefile:1.5 src/external/gpl3/Makefile:1.6
--- src/external/gpl3/Makefile:1.5	Sat Oct  8 21:52:15 2011
+++ src/external/gpl3/Makefile	Mon Oct 31 08:14:44 2011
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.5 2011/10/08 21:52:15 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2011/10/31 08:14:44 mrg Exp $
 
 .include bsd.own.mk
 
-.if ${MKBINUTILS} != no  ${HAVE_BINUTILS} == 219
+.if ${MKBINUTILS} != no
 SUBDIR+=	binutils
 .endif
 

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.687 src/share/mk/bsd.own.mk:1.688
--- src/share/mk/bsd.own.mk:1.687	Sun Oct 30 08:50:14 2011
+++ src/share/mk/bsd.own.mk	Mon Oct 31 08:14:44 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.687 2011/10/30 08:50:14 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.688 2011/10/31 08:14:44 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -47,27 +47,18 @@ NEED_OWN_INSTALL_TARGET?=	yes
 TOOLCHAIN_MISSING?=	no
 
 #
-# Platforms using GCC 4.5
+# Platforms still using GCC 4.1
 #
-.if ${MACHINE_ARCH} == hppa	   || \
-${MACHINE_ARCH} == i386  || \
-${MACHINE_CPU}  == mips  || \
-${MACHINE_ARCH} == powerpc   || \
-${MACHINE_ARCH} == powerpc64 || \
-${MACHINE_CPU}  == sh3   || \
-${MACHINE_ARCH} == sparc || \
-${MACHINE_ARCH} == sparc64   || \
-${MACHINE_ARCH} == x86_64
+.if ${MACHINE_ARCH} == alpha	|| \
+${MACHINE_CPU}  == arm	|| \
+${MACHINE_CPU}  == m68k	|| \
+${MACHINE_CPU}  == vax
+HAVE_GCC?=4
+.else
+# Otherwise, default to GCC4.5
 HAVE_GCC?=45
 .endif
 
-#
-# Otherwise, default to GCC4.1
-#
-.if !defined(HAVE_GCC)  !defined(HAVE_PCC)
-HAVE_GCC=	4
-.endif
-
 .if \
 ${MACHINE_ARCH} == i386 || \
 ${MACHINE_ARCH} == powerpc || \
@@ -76,27 +67,22 @@ USE_COMPILERCRTSTUFF?=	no
 .endif
 USE_COMPILERCRTSTUFF?=	yes
 
+
 #
-# Platforms using GDB 7
+# Platforms still using GDB 6
 #
-.if ${MACHINE_ARCH} == i386  || \
-${MACHINE_ARCH} == x86_64|| \
-${MACHINE_ARCH} == sparc64   || \
-${MACHINE_ARCH} == sparc || \
-${MACHINE_ARCH} == arm   || \
-${MACHINE_ARCH} == powerpc   || \
-${MACHINE_ARCH} == powerpc64 || \
-${MACHINE_CPU}  == m68k
-HAVE_GDB?= 7
+.if ${MACHINE_ARCH} == alpha	|| \
+${MACHINE_ARCH} == hppa	|| \
+${MACHINE_CPU}  == mips	|| \
+${MACHINE_CPU}  == sh3	|| \
+${MACHINE_ARCH} == vax
+HAVE_GDB?= 6
 .else
-# default to GDB6
-HAVE_GDB?=	6
+# Otherwise, default to GDB7
+HAVE_GDB?=	7
 .endif
 
 
-# default to binutils 2.19
-HAVE_BINUTILS?=	219
-
 .if empty(.MAKEFLAGS:M-V*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
 PRINTOBJDIR=	${MAKE} -r -V .OBJDIR -f /dev/null xxx

Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.20 src/tools/binutils/Makefile:1.21
--- src/tools/binutils/Makefile:1.20	Thu Aug  4 02:38:41 2011
+++ src/tools/binutils/Makefile	Mon Oct 31 08:14:44 2011
@@ -1,19 +1,15 @@
-#	$NetBSD: Makefile,v 1.20 2011/08/04 02:38:41 mrg Exp $
+#	$NetBSD: Makefile,v 1.21 2011/10/31 08:14:44 mrg Exp $
 
 .include bsd.own.mk
 
 MODULE=		binutils
 
-.if $(HAVE_BINUTILS) == 219
 GNUHOSTDIST=	

CVS commit: src/sys/arch/sparc64/dev

2011-10-31 Thread Julian Coleman
Module Name:src
Committed By:   jdc
Date:   Mon Oct 31 08:28:46 UTC 2011

Modified Files:
src/sys/arch/sparc64/dev: ffb.c ffb_mainbus.c ffbvar.h

Log Message:
Add support for the WSDISPLAYIO_GET_EDID ioctl (requires passing a device_t
to ffb_attach).


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/dev/ffb_mainbus.c \
src/sys/arch/sparc64/dev/ffbvar.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/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.47 src/sys/arch/sparc64/dev/ffb.c:1.48
--- src/sys/arch/sparc64/dev/ffb.c:1.47	Sun Oct 23 06:06:24 2011
+++ src/sys/arch/sparc64/dev/ffb.c	Mon Oct 31 08:28:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb.c,v 1.47 2011/10/23 06:06:24 jdc Exp $	*/
+/*	$NetBSD: ffb.c,v 1.48 2011/10/31 08:28:46 jdc Exp $	*/
 /*	$OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.47 2011/10/23 06:06:24 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.48 2011/10/31 08:28:46 jdc Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -57,6 +57,8 @@ __KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.47
 #include dev/wsfont/wsfont.h
 #include dev/wscons/wsdisplay_vconsvar.h
 
+#include prop/proplib.h
+
 #include dev/i2c/i2cvar.h
 #include dev/i2c/i2c_bitbang.h
 #include dev/i2c/ddcvar.h
@@ -188,8 +190,9 @@ int ffb_set_vmode(struct ffb_softc *, st
 
 
 void
-ffb_attach(struct ffb_softc *sc)
+ffb_attach(device_t self)
 {
+	struct ffb_softc *sc = device_private(self);
 	struct wsemuldisplaydev_attach_args waa;
 	struct rasops_info *ri;
 	long defattr;
@@ -200,6 +203,7 @@ ffb_attach(struct ffb_softc *sc)
 	u_int blank = WSDISPLAYIO_VIDEO_ON;
 	char buf[6+1];
 	int i, try_edid;
+	prop_data_t data;
 
 	printf(:);
 		
@@ -307,6 +311,10 @@ ffb_attach(struct ffb_softc *sc)
 		if (ffb_debug)
 			edid_print(sc-sc_edid_info);
 
+		data = prop_data_create_data(sc-sc_edid_data, EDID_DATA_LEN);
+		prop_dictionary_set(device_properties(self), EDID, data);
+		prop_object_release(data);
+
 		if (try_edid)
 			for (i = 0; i  sc-sc_edid_info.edid_nmodes; i++) {
 if (ffb_set_vmode(sc,
@@ -493,6 +501,11 @@ ffb_ioctl(void *v, void *vs, u_long cmd,
 	case WSDISPLAYIO_GCURSOR:
 	case WSDISPLAYIO_SCURSOR:
 		return EIO; /* not supported yet */
+		break;
+	case WSDISPLAYIO_GET_EDID: {
+		struct wsdisplayio_edid_info *d = data;
+		return wsdisplayio_get_edid(sc-sc_dev, d);
+	}
 	default:
 		return EPASSTHROUGH;
 	}

Index: src/sys/arch/sparc64/dev/ffb_mainbus.c
diff -u src/sys/arch/sparc64/dev/ffb_mainbus.c:1.11 src/sys/arch/sparc64/dev/ffb_mainbus.c:1.12
--- src/sys/arch/sparc64/dev/ffb_mainbus.c:1.11	Fri Jul  1 18:48:36 2011
+++ src/sys/arch/sparc64/dev/ffb_mainbus.c	Mon Oct 31 08:28:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb_mainbus.c,v 1.11 2011/07/01 18:48:36 dyoung Exp $	*/
+/*	$NetBSD: ffb_mainbus.c,v 1.12 2011/10/31 08:28:46 jdc Exp $	*/
 /*	$OpenBSD: creator_mainbus.c,v 1.4 2002/07/26 16:39:04 jason Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffb_mainbus.c,v 1.11 2011/07/01 18:48:36 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffb_mainbus.c,v 1.12 2011/10/31 08:28:46 jdc Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -114,7 +114,7 @@ ffb_mainbus_attach(device_t parent, devi
 	if (strcmp(ma-ma_name, SUNW,afb) == 0)
 		sc-sc_type = FFB_AFB;
 
-	ffb_attach(sc);
+	ffb_attach(self);
 
 	return;
 
Index: src/sys/arch/sparc64/dev/ffbvar.h
diff -u src/sys/arch/sparc64/dev/ffbvar.h:1.11 src/sys/arch/sparc64/dev/ffbvar.h:1.12
--- src/sys/arch/sparc64/dev/ffbvar.h:1.11	Fri Jun  3 03:20:39 2011
+++ src/sys/arch/sparc64/dev/ffbvar.h	Mon Oct 31 08:28:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffbvar.h,v 1.11 2011/06/03 03:20:39 christos Exp $	*/
+/*	$NetBSD: ffbvar.h,v 1.12 2011/10/31 08:28:46 jdc Exp $	*/
 /*	$OpenBSD: creatorvar.h,v 1.6 2002/07/30 19:48:15 jason Exp $	*/
 
 /*
@@ -86,4 +86,4 @@ struct ffb_softc {
 #define	FBC_READ(sc,r) \
 bus_space_read_4((sc)-sc_bt, (sc)-sc_fbc_h, (r))
 
-void	ffb_attach(struct ffb_softc *);
+void	ffb_attach(device_t);



CVS commit: src/sys

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:18:32 UTC 2011

Modified Files:
src/sys/kern: kern_sleepq.c
src/sys/sys: lwp.h

Log Message:
- make lendpri/changepri similar.
- make common code a subroutine.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/kern/kern_sleepq.c
cvs rdiff -u -r1.155 -r1.156 src/sys/sys/lwp.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/kern_sleepq.c
diff -u src/sys/kern/kern_sleepq.c:1.43 src/sys/kern/kern_sleepq.c:1.44
--- src/sys/kern/kern_sleepq.c:1.43	Sat Sep  3 10:28:33 2011
+++ src/sys/kern/kern_sleepq.c	Mon Oct 31 12:18:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_sleepq.c,v 1.43 2011/09/03 10:28:33 christos Exp $	*/
+/*	$NetBSD: kern_sleepq.c,v 1.44 2011/10/31 12:18:32 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sleepq.c,v 1.43 2011/09/03 10:28:33 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sleepq.c,v 1.44 2011/10/31 12:18:32 yamt Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -422,26 +422,16 @@ sleepq_abort(kmutex_t *mtx, int unlock)
 }
 
 /*
- * sleepq_changepri:
+ * sleepq_reinsert:
  *
- *	Adjust the priority of an LWP residing on a sleepq.  This method
- *	will only alter the user priority; the effective priority is
- *	assumed to have been fixed at the time of insertion into the queue.
+ *	Move the possition of the lwp in the sleep queue after a possible
+ *	change of the lwp's effective priority.
  */
-void
-sleepq_changepri(lwp_t *l, pri_t pri)
+static void
+sleepq_reinsert(sleepq_t *sq, lwp_t *l)
 {
-	sleepq_t *sq = l-l_sleepq;
-	pri_t opri;
-
-	KASSERT(lwp_locked(l, NULL));
 
-	opri = lwp_eprio(l);
-	l-l_priority = pri;
-
-	if (lwp_eprio(l) == opri) {
-		return;
-	}
+	KASSERT(l-l_sleepq == sq);
 	if ((l-l_syncobj-sobj_flag  SOBJ_SLEEPQ_SORTED) == 0) {
 		return;
 	}
@@ -459,33 +449,34 @@ sleepq_changepri(lwp_t *l, pri_t pri)
 	sleepq_insert(sq, l, l-l_syncobj);
 }
 
+/*
+ * sleepq_changepri:
+ *
+ *	Adjust the priority of an LWP residing on a sleepq.
+ */
 void
-sleepq_lendpri(lwp_t *l, pri_t pri)
+sleepq_changepri(lwp_t *l, pri_t pri)
 {
 	sleepq_t *sq = l-l_sleepq;
-	pri_t opri;
 
 	KASSERT(lwp_locked(l, NULL));
 
-	opri = lwp_eprio(l);
-	l-l_inheritedprio = pri;
+	l-l_priority = pri;
+	sleepq_reinsert(sq, l);
+}
 
-	if (lwp_eprio(l) == opri) {
-		return;
-	}
-	if ((l-l_syncobj-sobj_flag  SOBJ_SLEEPQ_SORTED) == 0) {
-		return;
-	}
+/*
+ * sleepq_changepri:
+ *
+ *	Adjust the lended priority of an LWP residing on a sleepq.
+ */
+void
+sleepq_lendpri(lwp_t *l, pri_t pri)
+{
+	sleepq_t *sq = l-l_sleepq;
 
-	/*
-	 * Don't let the sleep queue become empty, even briefly.
-	 * cv_signal() and cv_broadcast() inspect it without the
-	 * sleep queue lock held and need to see a non-empty queue
-	 * head if there are waiters.
-	 */
-	if (TAILQ_FIRST(sq) == l  TAILQ_NEXT(l, l_sleepchain) == NULL) {
-		return;
-	}
-	TAILQ_REMOVE(sq, l, l_sleepchain);
-	sleepq_insert(sq, l, l-l_syncobj);
+	KASSERT(lwp_locked(l, NULL));
+
+	l-l_inheritedprio = pri;
+	sleepq_reinsert(sq, l);
 }

Index: src/sys/sys/lwp.h
diff -u src/sys/sys/lwp.h:1.155 src/sys/sys/lwp.h:1.156
--- src/sys/sys/lwp.h:1.155	Sun Aug  7 21:13:06 2011
+++ src/sys/sys/lwp.h	Mon Oct 31 12:18:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: lwp.h,v 1.155 2011/08/07 21:13:06 rmind Exp $	*/
+/*	$NetBSD: lwp.h,v 1.156 2011/10/31 12:18:32 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010
@@ -392,7 +392,11 @@ lwp_changepri(lwp_t *l, pri_t pri)
 {
 	KASSERT(mutex_owned(l-l_mutex));
 
+	if (l-l_priority == pri)
+		return;
+
 	(*l-l_syncobj-sobj_changepri)(l, pri);
+	KASSERT(l-l_priority == pri);
 }
 
 static inline void
@@ -404,6 +408,7 @@ lwp_lendpri(lwp_t *l, pri_t pri)
 		return;
 
 	(*l-l_syncobj-sobj_lendpri)(l, pri);
+	KASSERT(l-l_inheritedprio == pri);
 }
 
 static inline pri_t



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

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:42:36 UTC 2011

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

Log Message:
dumpsys_seg: don't overwrite the previous mapping


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/amd64/amd64/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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.167 src/sys/arch/amd64/amd64/machdep.c:1.168
--- src/sys/arch/amd64/amd64/machdep.c:1.167	Wed Aug 31 18:52:37 2011
+++ src/sys/arch/amd64/amd64/machdep.c	Mon Oct 31 12:42:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.167 2011/08/31 18:52:37 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.168 2011/10/31 12:42:36 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.167 2011/08/31 18:52:37 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.168 2011/10/31 12:42:36 yamt Exp $);
 
 /* #define XENDEBUG_LOW  */
 
@@ -1182,6 +1182,7 @@ dumpsys_seg(paddr_t maddr, paddr_t bytes
 		pmap_update(pmap_kernel());
 
 		error = (*dump)(dumpdev, blkno, (void *)dumpspace, n);
+		pmap_kremove(dumpspace, n * PAGE_SIZE);
 		if (error)
 			return error;
 		maddr += n;



CVS commit: src/sys/arch/i386/i386

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:42:53 UTC 2011

Modified Files:
src/sys/arch/i386/i386: dumpsys.c

Log Message:
dumpsys_seg: don't overwrite the previous mapping


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/i386/dumpsys.c

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

Modified files:

Index: src/sys/arch/i386/i386/dumpsys.c
diff -u src/sys/arch/i386/i386/dumpsys.c:1.12 src/sys/arch/i386/i386/dumpsys.c:1.13
--- src/sys/arch/i386/i386/dumpsys.c:1.12	Sat Nov  6 11:40:25 2010
+++ src/sys/arch/i386/i386/dumpsys.c	Mon Oct 31 12:42:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumpsys.c,v 1.12 2010/11/06 11:40:25 uebayasi Exp $	*/
+/*	$NetBSD: dumpsys.c,v 1.13 2011/10/31 12:42:53 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dumpsys.c,v 1.12 2010/11/06 11:40:25 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: dumpsys.c,v 1.13 2011/10/31 12:42:53 yamt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -668,6 +668,7 @@ dumpsys_seg(paddr_t maddr, paddr_t bytes
 		pmap_update(pmap_kernel());
 
 		error = (*dump)(dumpdev, blkno, (void *)dumpspace, n);
+		pmap_kremove(dumpspace, n * PAGE_SIZE);
 		if (error)
 			return error;
 		maddr += n;



CVS commit: src/sys/dev/ic

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:47:15 UTC 2011

Modified Files:
src/sys/dev/ic: hpet.c hpetreg.h

Log Message:
hpet:
- fix an integer overflow bug introduced by hpet.c rev.1.11.
- a workaround for AMD SB700 based systems, inspired from linux.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/hpet.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/hpetreg.h

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

Modified files:

Index: src/sys/dev/ic/hpet.c
diff -u src/sys/dev/ic/hpet.c:1.12 src/sys/dev/ic/hpet.c:1.13
--- src/sys/dev/ic/hpet.c:1.12	Fri Jul 29 19:19:14 2011
+++ src/sys/dev/ic/hpet.c	Mon Oct 31 12:47:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hpet.c,v 1.12 2011/07/29 19:19:14 jakllsch Exp $ */
+/* $NetBSD: hpet.c,v 1.13 2011/10/31 12:47:15 yamt Exp $ */
 
 /*
  * Copyright (c) 2006 Nicolas Joly
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hpet.c,v 1.12 2011/07/29 19:19:14 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: hpet.c,v 1.13 2011/10/31 12:47:15 yamt Exp $);
 
 #include sys/systm.h
 #include sys/device.h
@@ -71,7 +71,9 @@ hpet_attach_subr(device_t dv)
 {
 	struct hpet_softc *sc = device_private(dv);
 	struct timecounter *tc;
+	uint64_t tmp;
 	uint32_t val;
+	int i;
 
 	tc = sc-sc_tc;
 
@@ -83,12 +85,27 @@ hpet_attach_subr(device_t dv)
 
 	/* Get frequency */
 	val = bus_space_read_4(sc-sc_memt, sc-sc_memh, HPET_PERIOD);
-	if (val == 0) {
+	if (val == 0 || val  HPET_PERIOD_MAX) {
 		aprint_error_dev(dv, invalid timer period\n);
 		return;
 	}
-	val = (1000ULL * 2) / val;
-	tc-tc_frequency = (val / 2) + (val  1);
+
+	/*
+	 * The following loop is a workaround for AMD SB700 based systems.
+	 * http://kerneltrap.org/mailarchive/git-commits-head/2008/8/17/2964724
+	 * http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a6825f1c1fa83b1e92b6715ee5771a4d6524d3b9
+	 */
+	for (i = 0; bus_space_read_4(sc-sc_memt, sc-sc_memh, HPET_CONFIG)
+	== 0x; i++) {
+		if (i = 1000) {
+			aprint_error_dev(dv,
+			HPET_CONFIG value = 0x\n);
+			return;
+		}
+	}
+
+	tmp = (1000ULL * 2) / val;
+	tc-tc_frequency = (tmp / 2) + (tmp  1);
 
 	/* Enable timer */
 	val = bus_space_read_4(sc-sc_memt, sc-sc_memh, HPET_CONFIG);

Index: src/sys/dev/ic/hpetreg.h
diff -u src/sys/dev/ic/hpetreg.h:1.3 src/sys/dev/ic/hpetreg.h:1.4
--- src/sys/dev/ic/hpetreg.h:1.3	Fri Feb 15 22:14:10 2008
+++ src/sys/dev/ic/hpetreg.h	Mon Oct 31 12:47:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hpetreg.h,v 1.3 2008/02/15 22:14:10 jmcneill Exp $ */
+/* $NetBSD: hpetreg.h,v 1.4 2011/10/31 12:47:15 yamt Exp $ */
 
 /*
  * Copyright (c) 2006 Nicolas Joly
@@ -36,6 +36,7 @@
 #define HPET_INFO		0x00
 #define HPET_INFO_64BITS 		0x2000
 #define HPET_PERIOD		0x04
+#define HPET_PERIOD_MAX			1
 #define HPET_CONFIG		0x10
 #define HPET_CONFIG_ENABLE		0x0001
 #define HPET_CONFIG_LEGRTCNF		0x0002



CVS commit: src/sys/miscfs/genfs

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:49:32 UTC 2011

Modified Files:
src/sys/miscfs/genfs: genfs_io.c

Log Message:
typo in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/miscfs/genfs/genfs_io.c

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

Modified files:

Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.52 src/sys/miscfs/genfs/genfs_io.c:1.53
--- src/sys/miscfs/genfs/genfs_io.c:1.52	Sun Oct  9 14:34:39 2011
+++ src/sys/miscfs/genfs/genfs_io.c	Mon Oct 31 12:49:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfs_io.c,v 1.52 2011/10/09 14:34:39 uebayasi Exp $	*/
+/*	$NetBSD: genfs_io.c,v 1.53 2011/10/31 12:49:32 yamt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.52 2011/10/09 14:34:39 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.53 2011/10/31 12:49:32 yamt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1641,7 +1641,7 @@ genfs_directio(struct vnode *vp, struct 
 
 	/*
 	 * If the vnode is mapped, we would need to get the getpages lock
-	 * to stabilize the bmap, but then we would get into trouble whil e
+	 * to stabilize the bmap, but then we would get into trouble while
 	 * locking the pages if the pages belong to this same vnode (or a
 	 * multi-vnode cascade to the same effect).  Just fall back to
 	 * buffered I/O if the vnode is mapped to avoid this mess.



CVS commit: src/sys/net

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:50:50 UTC 2011

Modified Files:
src/sys/net: rtsock.c

Log Message:
remove an unnecessary cast


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/net/rtsock.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/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.136 src/sys/net/rtsock.c:1.137
--- src/sys/net/rtsock.c:1.136	Sun Jul 17 20:54:52 2011
+++ src/sys/net/rtsock.c	Mon Oct 31 12:50:50 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.136 2011/07/17 20:54:52 joerg Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.137 2011/10/31 12:50:50 yamt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtsock.c,v 1.136 2011/07/17 20:54:52 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtsock.c,v 1.137 2011/10/31 12:50:50 yamt Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_inet.h
@@ -350,7 +350,7 @@ COMPATNAME(route_output)(struct mbuf *m,
 			info.rti_info[RTAX_DST] = rt_getkey(rt);
 			info.rti_info[RTAX_GATEWAY] = rt-rt_gateway;
 			info.rti_info[RTAX_NETMASK] = rt_mask(rt);
-			info.rti_info[RTAX_TAG] = (struct sockaddr*)rt_gettag(rt);
+			info.rti_info[RTAX_TAG] = rt_gettag(rt);
 			if ((rtm-rtm_addrs  (RTA_IFP | RTA_IFA)) == 0)
 ;
 			else if ((ifp = rt-rt_ifp) != NULL) {



CVS commit: src/sys/netinet

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:52:19 UTC 2011

Modified Files:
src/sys/netinet: tcp_var.h

Log Message:
tcp_reass_unlock: assertion


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/netinet/tcp_var.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/netinet/tcp_var.h
diff -u src/sys/netinet/tcp_var.h:1.167 src/sys/netinet/tcp_var.h:1.168
--- src/sys/netinet/tcp_var.h:1.167	Wed May 25 23:17:44 2011
+++ src/sys/netinet/tcp_var.h	Mon Oct 31 12:52:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_var.h,v 1.167 2011/05/25 23:17:44 gdt Exp $	*/
+/*	$NetBSD: tcp_var.h,v 1.168 2011/10/31 12:52:19 yamt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -408,6 +408,7 @@ tcp_reass_unlock(struct tcpcb *tp)
 	int s;
 
 	s = splvm();
+	KASSERT((tp-t_flags  TF_REASSEMBLING) != 0);
 	tp-t_flags = ~TF_REASSEMBLING;
 	splx(s);
 }



CVS commit: src/sys/netinet

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:56:46 UTC 2011

Modified Files:
src/sys/netinet: tcp_subr.c

Log Message:
tcp_drain: grab softnet_lock where appropriate


To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/netinet/tcp_subr.c

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

Modified files:

Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.241 src/sys/netinet/tcp_subr.c:1.242
--- src/sys/netinet/tcp_subr.c:1.241	Tue May  3 18:28:45 2011
+++ src/sys/netinet/tcp_subr.c	Mon Oct 31 12:56:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_subr.c,v 1.241 2011/05/03 18:28:45 dyoung Exp $	*/
+/*	$NetBSD: tcp_subr.c,v 1.242 2011/10/31 12:56:45 yamt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v 1.241 2011/05/03 18:28:45 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_subr.c,v 1.242 2011/10/31 12:56:45 yamt Exp $);
 
 #include opt_inet.h
 #include opt_ipsec.h
@@ -1328,8 +1328,7 @@ tcp_drainstub(void)
 
 /*
  * Protocol drain routine.  Called when memory is in short supply.
- * Don't acquire softnet_lock as can be called from hardware
- * interrupt handler.
+ * Called from pr_fasttimo thus a callout context.
  */
 void
 tcp_drain(void)
@@ -1337,6 +1336,7 @@ tcp_drain(void)
 	struct inpcb_hdr *inph;
 	struct tcpcb *tp;
 
+	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 
 	/*
@@ -1371,6 +1371,7 @@ tcp_drain(void)
 	}
 
 	KERNEL_UNLOCK_ONE(NULL);
+	mutex_exit(softnet_lock);
 }
 
 /*



CVS commit: src/sys/netinet

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 13:01:42 UTC 2011

Modified Files:
src/sys/netinet: tcp_input.c

Log Message:
fix a double unlock bug introduced by tcp_input.c rev.1.312.


To generate a diff of this commit:
cvs rdiff -u -r1.316 -r1.317 src/sys/netinet/tcp_input.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/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.316 src/sys/netinet/tcp_input.c:1.317
--- src/sys/netinet/tcp_input.c:1.316	Wed Aug 31 18:31:03 2011
+++ src/sys/netinet/tcp_input.c	Mon Oct 31 13:01:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_input.c,v 1.316 2011/08/31 18:31:03 plunky Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.317 2011/10/31 13:01:42 yamt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.316 2011/08/31 18:31:03 plunky Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.317 2011/10/31 13:01:42 yamt Exp $);
 
 #include opt_inet.h
 #include opt_ipsec.h
@@ -2926,7 +2926,6 @@ dodata:			/* XXX */
 			m_adj(m, hdroptlen);
 			tiflags = tcp_reass(tp, th, m, tlen);
 			tp-t_flags |= TF_ACKNOW;
-			TCP_REASS_UNLOCK(tp);
 		}
 
 		/*



CVS commit: src/sys/netinet

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 13:16:01 UTC 2011

Modified Files:
src/sys/netinet: ip_output.c

Log Message:
redo ip_output.c rev.1.206 and 1.207 differently.  PR/43664.
ok'ed by martin@


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/netinet/ip_output.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/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.209 src/sys/netinet/ip_output.c:1.210
--- src/sys/netinet/ip_output.c:1.209	Sun Jul 17 20:54:53 2011
+++ src/sys/netinet/ip_output.c	Mon Oct 31 13:16:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_output.c,v 1.209 2011/07/17 20:54:53 joerg Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.210 2011/10/31 13:16:01 yamt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_output.c,v 1.209 2011/07/17 20:54:53 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_output.c,v 1.210 2011/10/31 13:16:01 yamt Exp $);
 
 #include opt_pfil_hooks.h
 #include opt_inet.h
@@ -1008,12 +1008,19 @@ ip_fragment(struct mbuf *m, struct ifnet
 		m-m_pkthdr.len = mhlen + len;
 		m-m_pkthdr.rcvif = (struct ifnet *)0;
 		mhip-ip_sum = 0;
+		KASSERT((m-m_pkthdr.csum_flags  M_CSUM_IPv4) == 0);
 		if (sw_csum  M_CSUM_IPv4) {
 			mhip-ip_sum = in_cksum(m, mhlen);
-			KASSERT((m-m_pkthdr.csum_flags  M_CSUM_IPv4) == 0);
 		} else {
-			m-m_pkthdr.csum_flags |= M_CSUM_IPv4;
+			/*
+			 * checksum is hw-offloaded or not necessary.
+			 */
+			m-m_pkthdr.csum_flags |=
+			m0-m_pkthdr.csum_flags  M_CSUM_IPv4;
 			m-m_pkthdr.csum_data |= mhlen  16;
+			KASSERT(!(ifp != NULL 
+			IN_NEED_CHECKSUM(ifp, M_CSUM_IPv4))
+			|| (m-m_pkthdr.csum_flags  M_CSUM_IPv4) != 0);
 		}
 		IP_STATINC(IP_STAT_OFRAGMENTS);
 		fragments++;
@@ -1028,19 +1035,17 @@ ip_fragment(struct mbuf *m, struct ifnet
 	ip-ip_len = htons((u_int16_t)m-m_pkthdr.len);
 	ip-ip_off |= htons(IP_MF);
 	ip-ip_sum = 0;
-	/*
-	 * We may not use checksums on loopback interfaces
-	 */
-	if (__predict_false(ifp == NULL) ||
-	IN_NEED_CHECKSUM(ifp, M_CSUM_IPv4)) {
-		if (sw_csum  M_CSUM_IPv4) {
-			ip-ip_sum = in_cksum(m, hlen);
-			m-m_pkthdr.csum_flags = ~M_CSUM_IPv4;
-		} else {
-			KASSERT(m-m_pkthdr.csum_flags  M_CSUM_IPv4);
-			KASSERT(M_CSUM_DATA_IPv4_IPHL(m-m_pkthdr.csum_data) =
-sizeof(struct ip));
-		}
+	if (sw_csum  M_CSUM_IPv4) {
+		ip-ip_sum = in_cksum(m, hlen);
+		m-m_pkthdr.csum_flags = ~M_CSUM_IPv4;
+	} else {
+		/*
+		 * checksum is hw-offloaded or not necessary.
+		 */
+		KASSERT(!(ifp != NULL  IN_NEED_CHECKSUM(ifp, M_CSUM_IPv4))
+		   || (m-m_pkthdr.csum_flags  M_CSUM_IPv4) != 0);
+		KASSERT(M_CSUM_DATA_IPv4_IPHL(m-m_pkthdr.csum_data) =
+			sizeof(struct ip));
 	}
 sendorfree:
 	/*



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

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 13:17:22 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: scheduler.c

Log Message:
comment


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/rump/librump/rumpkern/scheduler.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/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.26 src/sys/rump/librump/rumpkern/scheduler.c:1.27
--- src/sys/rump/librump/rumpkern/scheduler.c:1.26	Mon Mar 21 16:41:09 2011
+++ src/sys/rump/librump/rumpkern/scheduler.c	Mon Oct 31 13:17:22 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: scheduler.c,v 1.26 2011/03/21 16:41:09 pooka Exp $	*/
+/*  $NetBSD: scheduler.c,v 1.27 2011/10/31 13:17:22 yamt Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.26 2011/03/21 16:41:09 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.27 2011/10/31 13:17:22 yamt Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -219,6 +219,10 @@ lwp0rele(void)
 	rumpuser_mutex_exit(lwp0mtx);
 }
 
+/*
+ * rump_schedule: ensure that the calling host thread has a valid lwp context.
+ * ie. ensure that rumpuser_get_curlwp() != NULL.
+ */
 void
 rump_schedule()
 {



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

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 13:23:55 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: vm.c

Log Message:
replace a non us-ascii character in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/rump/librump/rumpkern/vm.c

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

Modified files:

Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.119 src/sys/rump/librump/rumpkern/vm.c:1.120
--- src/sys/rump/librump/rumpkern/vm.c:1.119	Fri Sep  2 10:18:38 2011
+++ src/sys/rump/librump/rumpkern/vm.c	Mon Oct 31 13:23:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.119 2011/09/02 10:18:38 christos Exp $	*/
+/*	$NetBSD: vm.c,v 1.120 2011/10/31 13:23:55 yamt Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.119 2011/09/02 10:18:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120 2011/10/31 13:23:55 yamt Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -97,7 +97,7 @@ static unsigned long dddlim;		/* 90% of 
 /*
  * Try to free two pages worth of pages from objects.
  * If this succesfully frees a full page cache page, we'll
- * free the released page plus PAGE_SIZEĀ²/sizeof(vm_page).
+ * free the released page plus PAGE_SIZE/sizeof(vm_page).
  */
 #define PAGEDAEMON_OBJCHUNK (2*PAGE_SIZE / sizeof(struct vm_page))
 



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

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 13:25:21 UTC 2011

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

Log Message:
fix a type in a printf message


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/net/lib/libvirtif/if_virt.c

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

Modified files:

Index: src/sys/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.24 src/sys/rump/net/lib/libvirtif/if_virt.c:1.25
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.24	Sun Aug  7 14:03:16 2011
+++ src/sys/rump/net/lib/libvirtif/if_virt.c	Mon Oct 31 13:25:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_virt.c,v 1.24 2011/08/07 14:03:16 rmind Exp $	*/
+/*	$NetBSD: if_virt.c,v 1.25 2011/10/31 13:25:21 yamt Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.24 2011/08/07 14:03:16 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.25 2011/10/31 13:25:21 yamt Exp $);
 
 #include sys/param.h
 #include sys/condvar.h
@@ -279,7 +279,7 @@ virtif_receiver(void *arg)
 goto again;
 			}
 
-			printf(%s: read from /dev/tap failed. host if down?\n,
+			printf(%s: read from /dev/tap failed. host is down?\n,
 			ifp-if_xname);
 			mutex_enter(sc-sc_mtx);
 			/* could check if need go, done soon anyway */



CVS commit: src/usr.bin/iconv

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 13:27:51 UTC 2011

Modified Files:
src/usr.bin/iconv: iconv.c

Log Message:
annotate for lint


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/iconv/iconv.c

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

Modified files:

Index: src/usr.bin/iconv/iconv.c
diff -u src/usr.bin/iconv/iconv.c:1.17 src/usr.bin/iconv/iconv.c:1.18
--- src/usr.bin/iconv/iconv.c:1.17	Fri Sep 16 15:39:26 2011
+++ src/usr.bin/iconv/iconv.c	Mon Oct 31 13:27:51 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: iconv.c,v 1.17 2011/09/16 15:39:26 joerg Exp $ */
+/*	$NetBSD: iconv.c,v 1.18 2011/10/31 13:27:51 yamt Exp $ */
 
 /*-
  * Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: iconv.c,v 1.17 2011/09/16 15:39:26 joerg Exp $);
+__RCSID($NetBSD: iconv.c,v 1.18 2011/10/31 13:27:51 yamt Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include err.h
@@ -89,6 +89,7 @@ show_codesets(void)
 
 #define INBUFSIZE 1024
 #define OUTBUFSIZE (INBUFSIZE * 2)
+/*ARGSUSED*/
 static void
 do_conv(const char *fn, FILE *fp, const char *from, const char *to, int silent,
 int hide_invalid)



CVS commit: src/share/mk

2011-10-31 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Mon Oct 31 14:20:12 UTC 2011

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

Log Message:
switch everything except vax to gcc 4.5.
switch m68k to -Os since -O2 produces much bigger code
with gcc 4.5 than it did with gcc 4.1.


To generate a diff of this commit:
cvs rdiff -u -r1.688 -r1.689 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.209 -r1.210 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.106 -r1.107 src/share/mk/sys.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.688 src/share/mk/bsd.own.mk:1.689
--- src/share/mk/bsd.own.mk:1.688	Mon Oct 31 08:14:44 2011
+++ src/share/mk/bsd.own.mk	Mon Oct 31 14:20:11 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.688 2011/10/31 08:14:44 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.689 2011/10/31 14:20:11 chs Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -49,10 +49,7 @@ TOOLCHAIN_MISSING?=	no
 #
 # Platforms still using GCC 4.1
 #
-.if ${MACHINE_ARCH} == alpha	|| \
-${MACHINE_CPU}  == arm	|| \
-${MACHINE_CPU}  == m68k	|| \
-${MACHINE_CPU}  == vax
+.if ${MACHINE_CPU}  == vax
 HAVE_GCC?=4
 .else
 # Otherwise, default to GCC4.5
@@ -1089,7 +1086,6 @@ X11SRCDIR.xf86-input-${_i}?=	${X11SRCDIR
 	s3 s3virge savage siliconmotion sis suncg14 \
 	suncg6 sunffb sunleo suntcx \
 	tdfx tga trident tseng vesa vga via vmware wsfb
-	
 X11SRCDIR.xf86-video-${_v}?=	${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor
 

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.209 src/share/mk/bsd.sys.mk:1.210
--- src/share/mk/bsd.sys.mk:1.209	Tue Sep 20 09:11:06 2011
+++ src/share/mk/bsd.sys.mk	Mon Oct 31 14:20:12 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.209 2011/09/20 09:11:06 joerg Exp $
+#	$NetBSD: bsd.sys.mk,v 1.210 2011/10/31 14:20:12 chs Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -66,8 +66,11 @@ CFLAGS+=	-Wsign-compare -Wformat=2
 CFLAGS+=	${${ACTIVE_CC} == clang:? -Wpointer-sign -Wmissing-noreturn :}
 .endif
 .if (defined(HAVE_GCC)  ${HAVE_GCC} == 45 \
-  (${MACHINE_ARCH} == sh3eb || ${MACHINE_ARCH} == sh3el))
-# XXX GCC 4.5 for sh3 (which we compile with -Os) is extra noisy for
+  (${MACHINE_ARCH} == sh3eb || \
+	 ${MACHINE_ARCH} == sh3el || \
+	 ${MACHINE_ARCH} == m68k || \
+	 ${MACHINE_ARCH} == m68000))
+# XXX GCC 4.5 for sh3 and m68k (which we compile with -Os) is extra noisy for
 # cases it should be better with
 CFLAGS+=	-Wno-uninitialized
 .endif

Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.106 src/share/mk/sys.mk:1.107
--- src/share/mk/sys.mk:1.106	Fri May 20 14:27:48 2011
+++ src/share/mk/sys.mk	Mon Oct 31 14:20:12 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: sys.mk,v 1.106 2011/05/20 14:27:48 joerg Exp $
+#	$NetBSD: sys.mk,v 1.107 2011/10/31 14:20:12 chs Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run NetBSD.
@@ -20,29 +20,16 @@ COMPILE.S?=	${CC} ${AFLAGS} ${AFLAGS.${
 LINK.S?=	${CC} ${AFLAGS} ${AFLAGS.${:T}} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		cc
-.if ${MACHINE_ARCH} == alpha || \
-${MACHINE_ARCH} == arm || \
-${MACHINE_ARCH} == x86_64 || \
-${MACHINE_ARCH} == armeb || \
-${MACHINE_ARCH} == hppa || \
-${MACHINE_ARCH} == i386 || \
-${MACHINE_ARCH} == m68k || \
-${MACHINE_ARCH} == mipsel || ${MACHINE_ARCH} == mipseb || \
-${MACHINE_ARCH} == mips64el || ${MACHINE_ARCH} == mips64eb || \
-${MACHINE_ARCH} == powerpc || \
-${MACHINE_ARCH} == sparc || \
-${MACHINE_ARCH} == sparc64
-DBG?=	-O2
-.elif ${MACHINE_ARCH} == sh3el || ${MACHINE_ARCH} == sh3eb
+.if ${MACHINE_ARCH} == sh3el || ${MACHINE_ARCH} == sh3eb
 # -O2 is too -falign-* zealous for low-memory sh3 machines
 DBG?=	-Os -freorder-blocks
+.elif ${MACHINE_ARCH} == m68k || ${MACHINE_ARCH} == m68000
+# see src/doc/HACKS for details
+DBG?=	-Os
 .elif ${MACHINE_ARCH} == vax
 DBG?=	-O1 -fgcse -fstrength-reduce -fgcse-after-reload
-.elif ${MACHINE_ARCH} == m68000
-# see src/doc/HACKS for details
-DBG?=	-O1
 .else
-DBG?=	-O
+DBG?=	-O2
 .endif
 CFLAGS?=	${DBG}
 LDFLAGS?=



CVS commit: src/sbin/atactl

2011-10-31 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Mon Oct 31 14:44:07 UTC 2011

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
Wrap or shorten lines longer than 80 columns.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sbin/atactl/atactl.c

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

Modified files:

Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.63 src/sbin/atactl/atactl.c:1.64
--- src/sbin/atactl/atactl.c:1.63	Mon Oct 24 19:15:42 2011
+++ src/sbin/atactl/atactl.c	Mon Oct 31 14:44:07 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atactl.c,v 1.63 2011/10/24 19:15:42 jakllsch Exp $	*/
+/*	$NetBSD: atactl.c,v 1.64 2011/10/31 14:44:07 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.63 2011/10/24 19:15:42 jakllsch Exp $);
+__RCSID($NetBSD: atactl.c,v 1.64 2011/10/31 14:44:07 jakllsch Exp $);
 #endif
 
 
@@ -102,8 +102,10 @@ struct bitinfo {
 
 __dead static void	usage(void);
 static void	ata_command(struct atareq *);
-static void	print_bitinfo(const char *, const char *, u_int, const struct bitinfo *);
-static void	print_bitinfo2(const char *, const char *, u_int, u_int, const struct bitinfo *);
+static void	print_bitinfo(const char *, const char *, u_int,
+const struct bitinfo *);
+static void	print_bitinfo2(const char *, const char *, u_int, u_int,
+const struct bitinfo *);
 static void	print_smart_status(void *, void *);
 static void	print_error_entry(int, const struct ata_smart_error *);
 static void	print_selftest_entry(int, const struct ata_smart_selftest *);
@@ -119,7 +121,7 @@ static int	fd;/* file descriptor for
 static const	char *dvname;			/* device name */
 static char	dvname_store[MAXPATHLEN];	/* for opendisk(3) */
 static const	char *cmdname;			/* command user issued */
-static const	char *argnames;			/* helpstring: expected arguments */
+static const	char *argnames;		/* helpstring: expected arguments */
 
 static void	device_identify(int, char *[]);
 static void	device_setidle(int, char *[]);
@@ -140,7 +142,8 @@ static const struct command device_comma
 	{ standby,	,			device_idle },
 	{ sleep,	,			device_idle },
 	{ checkpower,	,			device_checkpower },
-	{ smart,	enable|disable|status|offline #|error-log|selftest-log,
+	{ smart,
+		enable|disable|status|offline #|error-log|selftest-log,
 		device_smart },
 	{ security,	freeze|status,	device_security },
 	{ NULL,		NULL,			NULL },
@@ -446,7 +449,8 @@ ata_command(struct atareq *req)
  */
 
 static void
-print_bitinfo(const char *bf, const char *af, u_int bits, const struct bitinfo *binfo)
+print_bitinfo(const char *bf, const char *af, u_int bits,
+const struct bitinfo *binfo)
 {
 
 	for (; binfo-bitmask != 0; binfo++)
@@ -455,7 +459,8 @@ print_bitinfo(const char *bf, const char
 }
 
 static void
-print_bitinfo2(const char *bf, const char *af, u_int bits, u_int enables, const struct bitinfo *binfo)
+print_bitinfo2(const char *bf, const char *af, u_int bits, u_int enables,
+const struct bitinfo *binfo)
 {
 
 	for (; binfo-bitmask != 0; binfo++)
@@ -510,7 +515,8 @@ print_smart_status(void *vbuf, void *tbu
 		return;
 	}
 
-	printf(id value thresh crit collect reliability description\t\t\traw\n);
+	printf(id value thresh crit collect reliability description
+	\t\t\traw\n);
 	for (i = 0; i  256; i++) {
 		int thresh = 0;
 
@@ -597,7 +603,8 @@ print_error_entry(int num, const struct 
 	printf(Log entry: %d\n, num);
 
 	for (i = 0; i  5; i++)
-		printf(\tCommand %d: dc=%02x sf=%02x sc=%02x sn=%02x cl=%02x ch=%02x dh=%02x cmd=%02x time=%02x%02x%02x%02x\n, i,
+		printf(\tCommand %d: dc=%02x sf=%02x sc=%02x sn=%02x cl=%02x 
+		ch=%02x dh=%02x cmd=%02x time=%02x%02x%02x%02x\n, i,
 		le-command[i].device_control,
 		le-command[i].features,
 		le-command[i].sector_count,
@@ -610,7 +617,8 @@ print_error_entry(int num, const struct 
 		le-command[i].timestamp[2],
 		le-command[i].timestamp[1],
 		le-command[i].timestamp[0]);
-	printf(\tError: err=%02x sc=%02x sn=%02x cl=%02x ch=%02x dh=%02x status=%02x state=%02x lifetime=%02x%02x\n,
+	printf(\tError: err=%02x sc=%02x sn=%02x cl=%02x ch=%02x dh=%02x 
+	status=%02x state=%02x lifetime=%02x%02x\n,
 	le-error_data.error,
 	le-error_data.sector_count,
 	le-error_data.sector_number,
@@ -621,7 +629,8 @@ print_error_entry(int num, const struct 
 	le-error_data.state,
 	le-error_data.lifetime[1],
 	le-error_data.lifetime[0]);
-	printf(\tExtended: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n,
+	printf(\tExtended: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x 
+	%02x %02x %02x %02x %02x %02x %02x %02x %02x\n,
 	le-error_data.extended_error[0],
 	le-error_data.extended_error[1],
 	le-error_data.extended_error[2],



CVS commit: src/sbin/atactl

2011-10-31 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Mon Oct 31 14:50:10 UTC 2011

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
Remove write-only variable.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sbin/atactl/atactl.c

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

Modified files:

Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.64 src/sbin/atactl/atactl.c:1.65
--- src/sbin/atactl/atactl.c:1.64	Mon Oct 31 14:44:07 2011
+++ src/sbin/atactl/atactl.c	Mon Oct 31 14:50:10 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atactl.c,v 1.64 2011/10/31 14:44:07 jakllsch Exp $	*/
+/*	$NetBSD: atactl.c,v 1.65 2011/10/31 14:50:10 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.64 2011/10/31 14:44:07 jakllsch Exp $);
+__RCSID($NetBSD: atactl.c,v 1.65 2011/10/31 14:50:10 jakllsch Exp $);
 #endif
 
 
@@ -121,7 +121,6 @@ static int	fd;/* file descriptor for
 static const	char *dvname;			/* device name */
 static char	dvname_store[MAXPATHLEN];	/* for opendisk(3) */
 static const	char *cmdname;			/* command user issued */
-static const	char *argnames;		/* helpstring: expected arguments */
 
 static void	device_identify(int, char *[]);
 static void	device_setidle(int, char *[]);
@@ -378,8 +377,6 @@ main(int argc, char *argv[])
 	if (commands == NULL)
 		errx(1, unknown command: %s, cmdname);
 
-	argnames = commands-arg_names;
-
 	(*commands-cmd_func)(argc, argv);
 	exit(0);
 }



CVS commit: src/sbin/atactl

2011-10-31 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Mon Oct 31 15:26:12 UTC 2011

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
Constify structure pointed to by getataparams() return value.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sbin/atactl/atactl.c

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

Modified files:

Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.65 src/sbin/atactl/atactl.c:1.66
--- src/sbin/atactl/atactl.c:1.65	Mon Oct 31 14:50:10 2011
+++ src/sbin/atactl/atactl.c	Mon Oct 31 15:26:11 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atactl.c,v 1.65 2011/10/31 14:50:10 jakllsch Exp $	*/
+/*	$NetBSD: atactl.c,v 1.66 2011/10/31 15:26:11 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.65 2011/10/31 14:50:10 jakllsch Exp $);
+__RCSID($NetBSD: atactl.c,v 1.66 2011/10/31 15:26:11 jakllsch Exp $);
 #endif
 
 
@@ -113,7 +113,7 @@ static void	print_selftest_entry(int, co
 static void	print_error(const void *);
 static void	print_selftest(const void *);
 
-static struct ataparams *getataparams(void);
+static const struct ataparams *getataparams(void);
 
 static int	is_smart(void);
 
@@ -755,7 +755,7 @@ print_selftest(const void *buf)
 		print_selftest_entry(i, stlog-log_entries[i]);
 }
 
-static struct ataparams *
+static const struct ataparams *
 getataparams(void)
 {
 	struct atareq req;
@@ -788,7 +788,7 @@ static int
 is_smart(void)
 {
 	int retval = 0;
-	struct ataparams *inqbuf;
+	const struct ataparams *inqbuf;
 	const char *status;
 
 	inqbuf = getataparams();
@@ -824,7 +824,7 @@ is_smart(void)
  */
 static void
 extract_string(char *buf, size_t bufmax,
-	   uint8_t *bytes, unsigned numbytes,
+	   const uint8_t *bytes, size_t numbytes,
 	   int needswap)
 {
 	unsigned i;
@@ -862,7 +862,7 @@ extract_string(char *buf, size_t bufmax,
 static void
 device_identify(int argc, char *argv[])
 {
-	struct ataparams *inqbuf;
+	const struct ataparams *inqbuf;
 	char model[sizeof(inqbuf-atap_model)+1];
 	char revision[sizeof(inqbuf-atap_revision)+1];
 	char serial[sizeof(inqbuf-atap_serial)+1];
@@ -884,7 +884,7 @@ device_identify(int argc, char *argv[])
 	if ((inqbuf-atap_integrity  WDC_INTEGRITY_MAGIC_MASK) ==
 	WDC_INTEGRITY_MAGIC) {
 		for (i = checksum = 0; i  512; i++)
-			checksum += ((uint8_t *)inqbuf)[i];
+			checksum += ((const uint8_t *)inqbuf)[i];
 		if (checksum != 0)
 			puts(IDENTIFY DEVICE data checksum invalid\n);
 	}
@@ -1362,7 +1362,7 @@ static void
 device_security(int argc, char *argv[])
 {
 	struct atareq req;
-	struct ataparams *inqbuf;
+	const struct ataparams *inqbuf;
 
 	/* need subcommand */
 	if (argc  1)



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

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 15:37:17 UTC 2011

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

Log Message:
add pipe2 tests


To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/distrib/sets/lists/tests/mi

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.411 src/distrib/sets/lists/tests/mi:1.412
--- src/distrib/sets/lists/tests/mi:1.411	Sun Oct 16 04:25:40 2011
+++ src/distrib/sets/lists/tests/mi	Mon Oct 31 11:37:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.411 2011/10/16 08:25:40 jruoho Exp $
+# $NetBSD: mi,v 1.412 2011/10/31 15:37:17 christos Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -513,6 +513,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_msync.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_nanosleep.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_pipe.debug			tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_pipe2.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_poll.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_posix_fadvise.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_revoke.debug		tests-lib-debug		debug,atf
@@ -2136,6 +2137,7 @@
 ./usr/tests/lib/libc/sys/t_msync		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_nanosleep		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_pipe			tests-lib-tests		atf
+./usr/tests/lib/libc/sys/t_pipe2		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_poll			tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_posix_fadvise	tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_revoke		tests-lib-tests		atf



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

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 15:41:32 UTC 2011

Modified Files:
src/tests/lib/libc/sys: Makefile t_pipe.c
Added Files:
src/tests/lib/libc/sys: t_pipe2.c

Log Message:
Move all pipe2 tests to a separate file.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/sys/t_pipe.c
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_pipe2.c

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

Modified files:

Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.16 src/tests/lib/libc/sys/Makefile:1.17
--- src/tests/lib/libc/sys/Makefile:1.16	Sat Oct 15 03:00:48 2011
+++ src/tests/lib/libc/sys/Makefile	Mon Oct 31 11:41:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/10/15 07:00:48 jruoho Exp $
+# $NetBSD: Makefile,v 1.17 2011/10/31 15:41:31 christos Exp $
 
 MKMAN=	no
 
@@ -34,6 +34,7 @@ TESTS_C+=		t_mprotect
 TESTS_C+=		t_msync
 TESTS_C+=		t_nanosleep
 TESTS_C+=		t_pipe
+TESTS_C+=		t_pipe2
 TESTS_C+=		t_posix_fadvise
 TESTS_C+=		t_poll
 TESTS_C+=		t_revoke

Index: src/tests/lib/libc/sys/t_pipe.c
diff -u src/tests/lib/libc/sys/t_pipe.c:1.2 src/tests/lib/libc/sys/t_pipe.c:1.3
--- src/tests/lib/libc/sys/t_pipe.c:1.2	Thu Oct 20 14:20:30 2011
+++ src/tests/lib/libc/sys/t_pipe.c	Mon Oct 31 11:41:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pipe.c,v 1.2 2011/10/20 18:20:30 njoly Exp $ */
+/* $NetBSD: t_pipe.c,v 1.3 2011/10/31 15:41:31 christos Exp $ */
 
 /*-
  * Copyright (c) 2001, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 #include sys/cdefs.h
 __COPYRIGHT(@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.);
-__RCSID($NetBSD: t_pipe.c,v 1.2 2011/10/20 18:20:30 njoly Exp $);
+__RCSID($NetBSD: t_pipe.c,v 1.3 2011/10/31 15:41:31 christos Exp $);
 
 #include sys/types.h
 #include sys/wait.h
@@ -155,34 +155,9 @@ ATF_TC_BODY(pipe_restart, tc)
 	}
 }
 
-ATF_TC(pipe2_cloexec);
-ATF_TC_HEAD(pipe2_cloexec, tc)
-{
-	atf_tc_set_md_var(tc, descr, Check pipe2(2) with O_CLOEXEC);
-}
-
-ATF_TC_BODY(pipe2_cloexec, tc)
-{
-	int flag, fildes[2];
-
-	ATF_REQUIRE(pipe2(fildes, O_CLOEXEC) != -1);
-
-	flag = fcntl(fildes[0], F_GETFD);
-	ATF_REQUIRE(flag != -1);
-	ATF_CHECK((flag  FD_CLOEXEC) != 0);
-
-	flag = fcntl(fildes[1], F_GETFD);
-	ATF_REQUIRE(flag != -1);
-	ATF_CHECK((flag  FD_CLOEXEC) != 0);
-
-	ATF_REQUIRE(close(fildes[0]) != -1);
-	ATF_REQUIRE(close(fildes[1]) != -1);
-}
-
 ATF_TP_ADD_TCS(tp)
 {
 	ATF_TP_ADD_TC(tp, pipe_restart);
-	ATF_TP_ADD_TC(tp, pipe2_cloexec);
 
 	return atf_no_error();
 }

Added files:

Index: src/tests/lib/libc/sys/t_pipe2.c
diff -u /dev/null src/tests/lib/libc/sys/t_pipe2.c:1.1
--- /dev/null	Mon Oct 31 11:41:32 2011
+++ src/tests/lib/libc/sys/t_pipe2.c	Mon Oct 31 11:41:31 2011
@@ -0,0 +1,136 @@
+/* $NetBSD: t_pipe2.c,v 1.1 2011/10/31 15:41:31 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes software developed by the NetBSD
+ *Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *contributors may be used to endorse or promote products derived
+ *from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include sys/cdefs.h
+__RCSID($NetBSD: 

CVS commit: src/tests/include/sys

2011-10-31 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Oct 31 18:37:01 UTC 2011

Modified Files:
src/tests/include/sys: t_bitops.c

Log Message:
No need to keep on trying when this fails in the expected manner.  We
really don't need to have 32k failures.

OK jruoho@


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/include/sys/t_bitops.c

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

Modified files:

Index: src/tests/include/sys/t_bitops.c
diff -u src/tests/include/sys/t_bitops.c:1.13 src/tests/include/sys/t_bitops.c:1.14
--- src/tests/include/sys/t_bitops.c:1.13	Sun Oct  2 18:34:17 2011
+++ src/tests/include/sys/t_bitops.c	Mon Oct 31 18:37:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_bitops.c,v 1.13 2011/10/02 18:34:17 christos Exp $ */
+/*	$NetBSD: t_bitops.c,v 1.14 2011/10/31 18:37:01 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: t_bitops.c,v 1.13 2011/10/02 18:34:17 christos Exp $);
+__RCSID($NetBSD: t_bitops.c,v 1.14 2011/10/31 18:37:01 pgoyette Exp $);
 
 #include atf-c.h
 
@@ -183,7 +183,7 @@ ATF_TC_BODY(ilog2_log2, tc)
 
 		if (fabs(floor(x) - y)  1.0e-40) {
 			atf_tc_expect_fail(PR misc/44767);
-			atf_tc_fail_nonfatal(log2(%PRIu64) != 
+			atf_tc_fail(log2(%PRIu64) != 
 			ilog2(%PRIu64), i, i);
 		}
 	}



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 18:40:40 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: i386nbsd-tdep.c

Log Message:
enable kernel stack frames now that I have tested them.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c:1.4 src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c:1.5
--- src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c:1.4	Sat Oct  8 17:47:52 2011
+++ src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c	Mon Oct 31 14:40:40 2011
@@ -448,10 +448,9 @@ i386nbsd_init_abi (struct gdbarch_info i
   tramp_frame_prepend_unwinder (gdbarch, i386nbsd_sigtramp_si2);
   tramp_frame_prepend_unwinder (gdbarch, i386nbsd_sigtramp_si31);
   tramp_frame_prepend_unwinder (gdbarch, i386nbsd_sigtramp_si4);
-#ifdef notyet
+
   /* Unwind kernel trap frames correctly.  */
   frame_unwind_prepend_unwinder (gdbarch, i386nbsd_trapframe_unwind);
-#endif
 }
 
 /* NetBSD ELF.  */



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 18:41:17 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: bsd-kvm.c

Log Message:
We need to allocate an inferior with our fake pid so that kernel core dumps
work.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/bsd-kvm.c
diff -u src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.3 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.4
--- src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.3	Sun Sep 25 16:25:08 2011
+++ src/external/gpl3/gdb/dist/gdb/bsd-kvm.c	Mon Oct 31 14:41:17 2011
@@ -70,6 +70,7 @@ bsd_kvm_open (char *filename, int from_t
   char errbuf[_POSIX2_LINE_MAX];
   char *execfile = NULL;
   kvm_t *temp_kd;
+  struct inferior *inf;
 
   target_preopen (from_tty);
 
@@ -97,6 +98,10 @@ bsd_kvm_open (char *filename, int from_t
   core_kd = temp_kd;
   push_target (bsd_kvm_ops);
 
+  inf = add_inferior_silent (PIDGET(bsd_kvm_ptid));
+  inf-aspace = maybe_new_address_space ();
+  inf-pspace = add_program_space (inf-aspace);
+
   add_thread_silent (bsd_kvm_ptid);
   inferior_ptid = bsd_kvm_ptid;
 



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

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 19:08:46 UTC 2011

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

Log Message:
#if-0'ed defines for PT_GETFPREGS and PT_SETFPREGS.  Not used yet, but
reserve the numbers as they are leaked to readelf(1), that has to know
them as NT_NETBSDCORE_FIRSTMACH + x (see get_netbsd_elfcore_note_type).


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sh3/include/ptrace.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/ptrace.h
diff -u src/sys/arch/sh3/include/ptrace.h:1.9 src/sys/arch/sh3/include/ptrace.h:1.10
--- src/sys/arch/sh3/include/ptrace.h:1.9	Fri Jan 28 21:06:07 2011
+++ src/sys/arch/sh3/include/ptrace.h	Mon Oct 31 19:08:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptrace.h,v 1.9 2011/01/28 21:06:07 uwe Exp $	*/
+/*	$NetBSD: ptrace.h,v 1.10 2011/10/31 19:08:45 uwe Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -46,6 +46,11 @@
 #define	PT_GETREGS	(PT_FIRSTMACH + 3)
 #define	PT_SETREGS	(PT_FIRSTMACH + 4)
 
+#if 0 /* XXX: not yet, but reserve the numbers leaked to readelf(1). */
+#define	PT_GETFPREGS	(PT_FIRSTMACH + 5)
+#define	PT_SETFPREGS	(PT_FIRSTMACH + 6)
+#endif
+
 #define PT_MACHDEP_STRINGS \
 	PT_STEP, \
 	PT___GETREGS40, \



CVS commit: src/external/gpl3/binutils/dist/binutils

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 19:12:48 UTC 2011

Modified Files:
src/external/gpl3/binutils/dist/binutils: readelf.c

Log Message:
get_netbsd_elfcore_note_type: sync SuperH PT_GETREGS value with
reality.  Recognize old PT___GETREGS40 (for struct __reg40 without
GBR).  Recognize PT_GETFPREGS that we don't yet actually have, but for
which the number is now reserved.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/binutils/readelf.c

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

Modified files:

Index: src/external/gpl3/binutils/dist/binutils/readelf.c
diff -u src/external/gpl3/binutils/dist/binutils/readelf.c:1.4 src/external/gpl3/binutils/dist/binutils/readelf.c:1.5
--- src/external/gpl3/binutils/dist/binutils/readelf.c:1.4	Sun Sep 25 04:32:36 2011
+++ src/external/gpl3/binutils/dist/binutils/readelf.c	Mon Oct 31 19:12:48 2011
@@ -11933,6 +11933,23 @@ get_netbsd_elfcore_note_type (unsigned e
 	}
   break;
 
+/* On SuperH, PT_GETREGS == mach+3 and PT_GETFPREGS == mach+5.
+   There's also old PT___GETREGS40 == mach + 1 for old reg
+   structure which lacks GBR.  */
+case EM_SH:
+  switch (e_type)
+	{
+	case NT_NETBSDCORE_FIRSTMACH + 1:
+	  return _(PT___GETREGS40 (old reg structure));
+	case NT_NETBSDCORE_FIRSTMACH + 3:
+	  return _(PT_GETREGS (reg structure));
+	case NT_NETBSDCORE_FIRSTMACH + 5:
+	  return _(PT_GETFPREGS (fpreg structure));
+	default:
+	  break;
+	}
+  break;
+
 /* On all other arch's, PT_GETREGS == mach+1 and
PT_GETFPREGS == mach+3.  */
 default:



CVS commit: src/external/bsd/file/include

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 20:52:15 UTC 2011

Modified Files:
src/external/bsd/file/include: config.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/file/include/config.h

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

Modified files:

Index: src/external/bsd/file/include/config.h
diff -u src/external/bsd/file/include/config.h:1.1 src/external/bsd/file/include/config.h:1.2
--- src/external/bsd/file/include/config.h:1.1	Fri May  8 13:28:02 2009
+++ src/external/bsd/file/include/config.h	Mon Oct 31 16:52:14 2011
@@ -1,4 +1,3 @@
-/*	$NetBSD: config.h,v 1.1 2009/05/08 17:28:02 christos Exp $	*/
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
@@ -14,6 +13,14 @@
 /* HAVE_DAYLIGHT */
 #define HAVE_DAYLIGHT 1
 
+/* Define to 1 if you have the declaration of `daylight', and to 0 if you
+   don't. */
+#define HAVE_DECL_DAYLIGHT 1
+
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+#define HAVE_DECL_TZNAME 1
+
 /* Define to 1 if you have the dlfcn.h header file. */
 #define HAVE_DLFCN_H 1
 
@@ -23,9 +30,15 @@
 /* Define to 1 if you have the fcntl.h header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1
 
+/* Define to 1 if you have the `getline' function. */
+#define HAVE_GETLINE 1
+
 /* Define to 1 if you have the getopt.h header file. */
 #define HAVE_GETOPT_H 1
 
@@ -41,6 +54,9 @@
 /* Define to 1 if you have the inttypes.h header file. */
 #define HAVE_INTTYPES_H 1
 
+/* Define to 1 if you have the `gnurx' library (-lgnurx). */
+/* #undef HAVE_LIBGNURX */
+
 /* Define to 1 if you have the `z' library (-lz). */
 #define HAVE_LIBZ 1
 
@@ -65,6 +81,9 @@
 /* Define to 1 if you have the `mmap' function. */
 #define HAVE_MMAP 1
 
+/* Define to 1 if the system has the type `pid_t'. */
+#define HAVE_PID_T 1
+
 /* Define to 1 if you have the stdint.h header file. */
 #define HAVE_STDINT_H 1
 
@@ -98,13 +117,13 @@
 /* HAVE_STRUCT_OPTION */
 #define HAVE_STRUCT_OPTION 1
 
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_rdev'. */
 #define HAVE_STRUCT_STAT_ST_RDEV 1
 
-/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */
+/* Define to 1 if `struct tm' is a member of `tm_gmtoff'. */
 #define HAVE_STRUCT_TM_TM_GMTOFF 1
 
-/* Define to 1 if `tm_zone' is member of `struct tm'. */
+/* Define to 1 if `struct tm' is a member of `tm_zone'. */
 #define HAVE_STRUCT_TM_TM_ZONE 1
 
 /* Define to 1 if you have the sys/mman.h header file. */
@@ -173,6 +192,10 @@
 /* Define to 1 if you have the zlib.h header file. */
 #define HAVE_ZLIB_H 1
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR .libs/
+
 /* Define to 1 if `major', `minor', and `makedev' are declared in mkdev.h.
*/
 /* #undef MAJOR_IN_MKDEV */
@@ -194,13 +217,16 @@
 #define PACKAGE_NAME file
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING file 5.03
+#define PACKAGE_STRING file 5.09
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME file
 
+/* Define to the home page for this package. */
+#define PACKAGE_URL 
+
 /* Define to the version of this package. */
-#define PACKAGE_VERSION 5.03
+#define PACKAGE_VERSION 5.09
 
 /* The size of `long long', as computed by sizeof. */
 #define SIZEOF_LONG_LONG 8
@@ -211,16 +237,33 @@
 /* Define to 1 if your sys/time.h declares `struct tm'. */
 /* #undef TM_IN_SYS_TIME */
 
-/* Version number of package */
-#define VERSION 5.03
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Version number of package */
+#define VERSION 5.09
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 /* #undef _LARGEFILE_SOURCE */
@@ -228,6 +271,16 @@
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if 

CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 21:00:39 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: shnbsd-nat.c

Log Message:
struct reg has GBR since NetBSD 5, so bump up SHNBSD_SIZEOF_GREGS.
It would be nice to detect this dynamically, but gdb7 wouldn't work on
NetBSD 4 anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/shnbsd-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/external/gpl3/gdb/dist/gdb/shnbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c:1.3 src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c:1.4
--- src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c:1.3	Mon Oct 24 23:58:01 2011
+++ src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c	Mon Oct 31 21:00:39 2011
@@ -43,7 +43,7 @@
 || (regno) == SR_REGNUM || (regno) == GBR_REGNUM)
 
 /* Sizeof `struct reg' in machine/reg.h.  */
-#define SHNBSD_SIZEOF_GREGS	(21 * 4)
+#define SHNBSD_SIZEOF_GREGS	(22 * 4)
 
 static void
 shnbsd_fetch_inferior_registers (struct target_ops *ops,



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

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 21:30:16 UTC 2011

Modified Files:
src/tests/lib/libc/sys: t_pipe2.c

Log Message:
make this work


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_pipe2.c

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

Modified files:

Index: src/tests/lib/libc/sys/t_pipe2.c
diff -u src/tests/lib/libc/sys/t_pipe2.c:1.1 src/tests/lib/libc/sys/t_pipe2.c:1.2
--- src/tests/lib/libc/sys/t_pipe2.c:1.1	Mon Oct 31 11:41:31 2011
+++ src/tests/lib/libc/sys/t_pipe2.c	Mon Oct 31 17:30:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pipe2.c,v 1.1 2011/10/31 15:41:31 christos Exp $ */
+/* $NetBSD: t_pipe2.c,v 1.2 2011/10/31 21:30:16 christos Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: t_pipe2.c,v 1.1 2011/10/31 15:41:31 christos Exp $);
+__RCSID($NetBSD: t_pipe2.c,v 1.2 2011/10/31 21:30:16 christos Exp $);
 
 #include atf-c.h
 #include fcntl.h
@@ -49,12 +49,12 @@ run(int flags)
 {
 	int fd[2], i;
 
-	while ((i = open(/, O_RDONLY  3))  3)
+	while ((i = open(/, O_RDONLY))  3)
 		ATF_REQUIRE(i != -1);
 
 	ATF_REQUIRE(fcntl(3, F_CLOSEM) != -1);
 
-	ATF_REQUIRE(pipe2(fd, 0) == 0);
+	ATF_REQUIRE(pipe2(fd, flags) == 0);
 
 	ATF_REQUIRE(fd[0] == 3);
 	ATF_REQUIRE(fd[1] == 4);
@@ -67,7 +67,7 @@ run(int flags)
 		ATF_REQUIRE((fcntl(fd[1], F_GETFD)  FD_CLOEXEC) == 0);
 	}
 
-	if (flags  O_CLOEXEC) {
+	if (flags  O_NONBLOCK) {
 		ATF_REQUIRE((fcntl(fd[0], F_GETFL)  O_NONBLOCK) != 0);
 		ATF_REQUIRE((fcntl(fd[1], F_GETFL)  O_NONBLOCK) != 0);
 	} else {



CVS commit: src/sys/kern

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 21:31:29 UTC 2011

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

Log Message:
PR/45545 Yui NARUSE: pipe2's return value is wrong


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/kern/sys_descrip.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/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.22 src/sys/kern/sys_descrip.c:1.23
--- src/sys/kern/sys_descrip.c:1.22	Sun Jun 26 12:42:42 2011
+++ src/sys/kern/sys_descrip.c	Mon Oct 31 17:31:29 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_descrip.c,v 1.22 2011/06/26 16:42:42 christos Exp $	*/
+/*	$NetBSD: sys_descrip.c,v 1.23 2011/10/31 21:31:29 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_descrip.c,v 1.22 2011/06/26 16:42:42 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_descrip.c,v 1.23 2011/10/31 21:31:29 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -759,5 +759,8 @@ sys_pipe2(struct lwp *l, const struct sy
 		return error;
 	fd[0] = retval[0];
 	fd[1] = retval[1];
-	return copyout(fd, SCARG(uap, fildes), sizeof(fd));
+	if ((error = copyout(fd, SCARG(uap, fildes), sizeof(fd))) != 0)
+		return error;
+	retval[0] = 0;
+	return 0;
 }



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 23:10:16 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: shnbsd-tdep.c

Log Message:
shnbsd_software_single_step: fix logic botch.  Now that removal of
software single step breakpoints is handled by the caller we no longer
need to keep static next_pc around.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.5 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.6
--- src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.5	Sat Oct 29 21:18:28 2011
+++ src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c	Mon Oct 31 23:10:16 2011
@@ -359,14 +359,11 @@ shnbsd_get_next_pc (struct regcache *reg
 int
 shnbsd_software_single_step (struct frame_info *frame)
 {
-  static CORE_ADDR next_pc;
   struct gdbarch *gdbarch = get_frame_arch (frame);
   struct address_space *aspace = get_frame_address_space (frame);
   struct regcache  *regcache= get_current_regcache ();
   CORE_ADDR pc = regcache_read_pc (regcache);
-
-  if (pc != next_pc)
-next_pc = shnbsd_get_next_pc (regcache, pc);
+  CORE_ADDR next_pc = shnbsd_get_next_pc (regcache, pc);
 
   insert_single_step_breakpoint (gdbarch, aspace, next_pc);
   return 1;



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 23:23:52 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: shnbsd-tdep.c

Log Message:
Since sh3 has got PT_STEP, nuke software single-stepping entirely.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.6 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.7
--- src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.6	Mon Oct 31 23:10:16 2011
+++ src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c	Mon Oct 31 23:23:52 2011
@@ -175,200 +175,6 @@ shnbsd_collect_gregset (const struct reg
 regcache_raw_collect (regcache, GBR_REGNUM, regs + (21 * 4));
 }
 
-/* Hitachi SH instruction encoding masks and opcodes */
-
-/*
- *	 x--x  	0xf900 mask
- *	1001 1**1  	0x8900 match
- * BT	1000 1001  
- * BF	1000 1011  
- * BT/S	1000 1101  
- * BF/S	1000   
- *	 --x-  	T or F?
- *	 -x--  	has delay slot
- */
-#define CONDITIONAL_BRANCH_P(insn) (((insn)  0xf900) == 0x8900)
-#define CONDITIONAL_BRANCH_TAKEN_P(insn, sr) insn)  9) ^ sr)  0x1)
-#define CONDITIONAL_BRANCH_SLOT_P(insn) (((insn)  0x0400) != 0)
-
-/*
- *	xxx-   	0xe000 mask
- *	101*   	0xa000 match
- * BRA	1010   
- * BSR	1011   
- */
-#define BRANCH_P(insn) (((insn)  0xe000) == 0xa000)
-
-/*
- *	  xx-x 	0xf0df mask
- *	  00*0 0011	0x0003 match
- * BSRF	   0011
- * BRAF	  0010 0011
- */
-#define BRANCH_FAR_P(insn) (((insn)  0xf0df) == 0x0003)
-#define BRANCH_FAR_REG(insn) (((insn)  8)  0xf)
-
-/*
- *	  xx-x 	0xf0df mask
- *	0100  00*0 1011	0x400b match
- * JSR	0100   1011
- * JMP	0100  0010 1011
- */
-#define JUMP_P(insn) (((insn)  0xf0df) == 0x400b)
-#define JUMP_REG(insn) (((insn)  8)  0xf)
-
-/*
- * RTS	   1011
- * RTE	  0010 1011
- */
-#define RTS_INSN 0x000b
-#define RTE_INSN 0x002b
-
-/*
- *	   	0xff00 mask
- *TRAPA 1100 0011  	0xc300 match
- */
-#define TRAPA_P(insn) (((insn)  0xff00) == 0xc300)
-
-
-/* signed 8-bit displacement */
-static int
-shnbsd_displacement_8 (unsigned short insn)
-{
-  int displacement;
-
-  if (insn  0x80)
-displacement = insn | 0xff00;
-  else
-displacement = insn  0x00ff;
-
-  return displacement;
-}
-
-/* signed 12-bit displacement */
-static int
-shnbsd_displacement_12 (unsigned short insn)
-{
-  int displacement;
-
-  if (insn  0x800)
-displacement = insn | 0xf000;
-  else
-displacement = insn  0x0fff;
-
-  return displacement;
-}
-
-static CORE_ADDR
-shnbsd_get_next_pc (struct regcache *regcache, CORE_ADDR pc)
-{
-  unsigned short insn;
-  ULONGEST sr;
-  LONGEST displacement;
-  int reg;
-  CORE_ADDR next_pc;
-  int delay_slot;
-  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
-
-  insn = read_memory_integer (pc, sizeof (insn), byte_order);
-  delay_slot = 0;
-
-  /* As we cannot step through the delay slot, we break at the target
- address of the control transfer.  One tricky case is when the
- target of the jump is the delay slot of that same instruction
- (e.g. PLT entries use such code).  In that case we cannot set the
- break to the target, as trapa is illegal in the delay slot.  Set
- break to the next instruction instead, we are guaranteed to
- arrive there, as control transfers are illegal in the delay
- slot. */
-
-  /* BT, BF, BT/S, BF/S */
-  if (CONDITIONAL_BRANCH_P(insn))
-{
-  regcache_cooked_read_unsigned (regcache, SR_REGNUM, sr);
-
-  delay_slot = CONDITIONAL_BRANCH_SLOT_P(insn);
-  if (!CONDITIONAL_BRANCH_TAKEN_P(insn, sr))
-	next_pc = pc + (delay_slot ? 4 : 2);
-  else
-	{
-	  displacement = shnbsd_displacement_8 (insn);
-
-	  next_pc = pc + 4 + (displacement  1);
-	}
-}
-
-  /* BRA, BSR */
-  else if (BRANCH_P(insn))
-{
-  displacement = shnbsd_displacement_12 (insn);
-
-  next_pc = pc + 4 + (displacement  1);
-  delay_slot = 1;
-}
-
-  /* BRAF, BSRF */
-  else if (BRANCH_FAR_P(insn))
-{
-  regcache_cooked_read_signed (regcache, BRANCH_FAR_REG(insn),
-	  displacement);
-  next_pc = pc + 4 + displacement;
-  delay_slot = 1;
-}
-
-  /* JMP, JSR */
-  else if (JUMP_P(insn))
-{
-  regcache_cooked_read_unsigned (regcache, JUMP_REG(insn), next_pc);
-  delay_slot = 1;
-}
-
-  /* RTS */
-  else if (insn == RTS_INSN)
-{
-  regcache_cooked_read_unsigned (regcache, PR_REGNUM, next_pc);
-  delay_slot = 1;
-}
-
-  /* RTE - XXX: privileged */
-  else if (insn == RTE_INSN)
-{
-  regcache_cooked_read_unsigned (regcache, SPC_REGNUM, next_pc);
-  

CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 23:30:27 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: shnbsd-tdep.c

Log Message:
Minor cosmetics to minimize diffs with vendor branch.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.7 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.8
--- src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.7	Mon Oct 31 23:23:52 2011
+++ src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c	Mon Oct 31 23:30:27 2011
@@ -282,11 +282,12 @@ shnbsd_init_abi (struct gdbarch_info inf
   set_gdbarch_regset_from_core_section
 (gdbarch, shnbsd_regset_from_core_section);
 
-  set_solib_svr4_fetch_link_map_offsets (gdbarch,
-		nbsd_ilp32_solib_svr4_fetch_link_map_offsets);
-  tramp_frame_prepend_unwinder (gdbarch, shnbsd_sigtramp_si2);
+  set_solib_svr4_fetch_link_map_offsets
+(gdbarch, nbsd_ilp32_solib_svr4_fetch_link_map_offsets);
 
+  tramp_frame_prepend_unwinder (gdbarch, shnbsd_sigtramp_si2);
 }
+
 
 static enum gdb_osabi
 shnbsd_core_osabi_sniffer (bfd *abfd)
@@ -297,6 +298,9 @@ shnbsd_core_osabi_sniffer (bfd *abfd)
   return GDB_OSABI_UNKNOWN;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_shnbsd_tdep;
+
 void
 _initialize_shnbsd_tdep (void)
 {



CVS commit: src/external/gpl3/gdb/dist/bfd

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Tue Nov  1 00:31:39 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/bfd: elf.c

Log Message:
elfcore_grok_netbsd_note: sync SuperH PT_GETREGS value with reality.
Recognize PT_GETFPREGS that we don't yet actually have, but for which
the number is now reserved.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/bfd/elf.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/bfd/elf.c
diff -u src/external/gpl3/gdb/dist/bfd/elf.c:1.1.1.1 src/external/gpl3/gdb/dist/bfd/elf.c:1.2
--- src/external/gpl3/gdb/dist/bfd/elf.c:1.1.1.1	Sat Sep 24 19:44:29 2011
+++ src/external/gpl3/gdb/dist/bfd/elf.c	Tue Nov  1 00:31:38 2011
@@ -8495,6 +8495,23 @@ elfcore_grok_netbsd_note (bfd *abfd, Elf
 	  return TRUE;
 	}
 
+  /* On SuperH, PT_GETREGS == mach+3 and PT_GETFPREGS == mach+5.
+	 There's also old PT___GETREGS40 == mach + 1 for old reg
+	 structure which lacks GBR.  */
+
+case bfd_arch_sh:
+  switch (note-type)
+	{
+	case NT_NETBSDCORE_FIRSTMACH+3:
+	  return elfcore_make_note_pseudosection (abfd, .reg, note);
+
+	case NT_NETBSDCORE_FIRSTMACH+5:
+	  return elfcore_make_note_pseudosection (abfd, .reg2, note);
+
+	default:
+	  return TRUE;
+	}
+
   /* On all other arch's, PT_GETREGS == mach+1 and
 	 PT_GETFPREGS == mach+3.  */
 



CVS commit: src/distrib/notes/common

2011-10-31 Thread Thomas Cort
Module Name:src
Committed By:   tcort
Date:   Tue Nov  1 02:04:44 UTC 2011

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

Log Message:
Add new developer Thomas Cort (tcort)


To generate a diff of this commit:
cvs rdiff -u -r1.481 -r1.482 src/distrib/notes/common/main

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/main
diff -u src/distrib/notes/common/main:1.481 src/distrib/notes/common/main:1.482
--- src/distrib/notes/common/main:1.481	Sat Sep 10 19:07:57 2011
+++ src/distrib/notes/common/main	Tue Nov  1 02:04:43 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: main,v 1.481 2011/09/10 19:07:57 marino Exp $
+.\	$NetBSD: main,v 1.482 2011/11/01 02:04:43 tcort Exp $
 .\
 .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -1118,6 +1118,7 @@ If you're one of them, and would like to
 .It Ta Julian Coleman Ta Mt j...@netbsd.org
 .It Ta Marcus Comstedt Ta Mt mar...@netbsd.org
 .It Ta Jeremy Cooper Ta Mt jer...@netbsd.org
+.It Ta Thomas Cort Ta Mt tc...@netbsd.org
 .It Ta Chuck Cranor Ta Mt ch...@netbsd.org
 .It Ta Alistair Crooks Ta Mt a...@netbsd.org
 .It Ta Johan Danielsson Ta Mt j...@netbsd.org



CVS commit: src

2011-10-31 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Oct 31 08:14:44 UTC 2011

Modified Files:
src/distrib/sets: mkvars.mk
src/external/gpl3: Makefile
src/share/mk: bsd.own.mk
src/tools/binutils: Makefile
src/tools/dbsym: Makefile
src/tools/mdsetimage: Makefile

Log Message:
obsolete now useless (and wrongly set to 219 :-) HAVE_BINUTILS.
switch the sense of the gdb and gcc tests to list the platforms not
switched to gcc 4.5 or gdb 7, which is now:

GCC 4.1:
.if ${MACHINE_ARCH} == alpha  || \
${MACHINE_CPU}  == arm|| \
${MACHINE_CPU}  == m68k   || \
${MACHINE_CPU}  == vax

GDB 6:
.if ${MACHINE_ARCH} == alpha  || \
${MACHINE_ARCH} == hppa   || \
${MACHINE_CPU}  == mips   || \
${MACHINE_CPU}  == sh3|| \
${MACHINE_ARCH} == vax

let's go, people!  (-:


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/Makefile
cvs rdiff -u -r1.687 -r1.688 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.20 -r1.21 src/tools/binutils/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tools/dbsym/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tools/mdsetimage/Makefile

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



CVS commit: src/sys/arch/sparc64/dev

2011-10-31 Thread Julian Coleman
Module Name:src
Committed By:   jdc
Date:   Mon Oct 31 08:28:46 UTC 2011

Modified Files:
src/sys/arch/sparc64/dev: ffb.c ffb_mainbus.c ffbvar.h

Log Message:
Add support for the WSDISPLAYIO_GET_EDID ioctl (requires passing a device_t
to ffb_attach).


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/dev/ffb_mainbus.c \
src/sys/arch/sparc64/dev/ffbvar.h

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



CVS commit: src/sys

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:18:32 UTC 2011

Modified Files:
src/sys/kern: kern_sleepq.c
src/sys/sys: lwp.h

Log Message:
- make lendpri/changepri similar.
- make common code a subroutine.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/kern/kern_sleepq.c
cvs rdiff -u -r1.155 -r1.156 src/sys/sys/lwp.h

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



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

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:42:36 UTC 2011

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

Log Message:
dumpsys_seg: don't overwrite the previous mapping


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/amd64/amd64/machdep.c

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



CVS commit: src/sys/arch/i386/i386

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:42:53 UTC 2011

Modified Files:
src/sys/arch/i386/i386: dumpsys.c

Log Message:
dumpsys_seg: don't overwrite the previous mapping


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/i386/dumpsys.c

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



CVS commit: src/sys/dev/ic

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:47:15 UTC 2011

Modified Files:
src/sys/dev/ic: hpet.c hpetreg.h

Log Message:
hpet:
- fix an integer overflow bug introduced by hpet.c rev.1.11.
- a workaround for AMD SB700 based systems, inspired from linux.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/hpet.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/hpetreg.h

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



CVS commit: src/sys/miscfs/genfs

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:49:32 UTC 2011

Modified Files:
src/sys/miscfs/genfs: genfs_io.c

Log Message:
typo in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/miscfs/genfs/genfs_io.c

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



CVS commit: src/sys/net

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:50:50 UTC 2011

Modified Files:
src/sys/net: rtsock.c

Log Message:
remove an unnecessary cast


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/net/rtsock.c

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



CVS commit: src/sys/netinet

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:52:19 UTC 2011

Modified Files:
src/sys/netinet: tcp_var.h

Log Message:
tcp_reass_unlock: assertion


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/netinet/tcp_var.h

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



CVS commit: src/sys/netinet

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 12:56:46 UTC 2011

Modified Files:
src/sys/netinet: tcp_subr.c

Log Message:
tcp_drain: grab softnet_lock where appropriate


To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/netinet/tcp_subr.c

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



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

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 13:23:55 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: vm.c

Log Message:
replace a non us-ascii character in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/rump/librump/rumpkern/vm.c

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



CVS commit: src/usr.bin/iconv

2011-10-31 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Mon Oct 31 13:27:51 UTC 2011

Modified Files:
src/usr.bin/iconv: iconv.c

Log Message:
annotate for lint


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/iconv/iconv.c

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



CVS commit: src/share/mk

2011-10-31 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Mon Oct 31 14:20:12 UTC 2011

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

Log Message:
switch everything except vax to gcc 4.5.
switch m68k to -Os since -O2 produces much bigger code
with gcc 4.5 than it did with gcc 4.1.


To generate a diff of this commit:
cvs rdiff -u -r1.688 -r1.689 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.209 -r1.210 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.106 -r1.107 src/share/mk/sys.mk

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



CVS commit: src/sbin/atactl

2011-10-31 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Mon Oct 31 14:44:07 UTC 2011

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
Wrap or shorten lines longer than 80 columns.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sbin/atactl/atactl.c

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



CVS commit: src/sbin/atactl

2011-10-31 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Mon Oct 31 14:50:10 UTC 2011

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
Remove write-only variable.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sbin/atactl/atactl.c

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



CVS commit: src/sbin/atactl

2011-10-31 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Mon Oct 31 15:26:12 UTC 2011

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
Constify structure pointed to by getataparams() return value.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sbin/atactl/atactl.c

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



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

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 15:37:17 UTC 2011

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

Log Message:
add pipe2 tests


To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/distrib/sets/lists/tests/mi

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



CVS commit: src/tests/include/sys

2011-10-31 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Oct 31 18:37:01 UTC 2011

Modified Files:
src/tests/include/sys: t_bitops.c

Log Message:
No need to keep on trying when this fails in the expected manner.  We
really don't need to have 32k failures.

OK jruoho@


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/include/sys/t_bitops.c

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



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 18:40:40 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: i386nbsd-tdep.c

Log Message:
enable kernel stack frames now that I have tested them.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c

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



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 18:41:17 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: bsd-kvm.c

Log Message:
We need to allocate an inferior with our fake pid so that kernel core dumps
work.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c

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



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

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 19:08:46 UTC 2011

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

Log Message:
#if-0'ed defines for PT_GETFPREGS and PT_SETFPREGS.  Not used yet, but
reserve the numbers as they are leaked to readelf(1), that has to know
them as NT_NETBSDCORE_FIRSTMACH + x (see get_netbsd_elfcore_note_type).


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sh3/include/ptrace.h

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



CVS commit: src/external/gpl3/binutils/dist/binutils

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 19:12:48 UTC 2011

Modified Files:
src/external/gpl3/binutils/dist/binutils: readelf.c

Log Message:
get_netbsd_elfcore_note_type: sync SuperH PT_GETREGS value with
reality.  Recognize old PT___GETREGS40 (for struct __reg40 without
GBR).  Recognize PT_GETFPREGS that we don't yet actually have, but for
which the number is now reserved.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/binutils/readelf.c

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



CVS commit: src/external/bsd/file/include

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 20:52:15 UTC 2011

Modified Files:
src/external/bsd/file/include: config.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/file/include/config.h

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



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 21:00:39 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: shnbsd-nat.c

Log Message:
struct reg has GBR since NetBSD 5, so bump up SHNBSD_SIZEOF_GREGS.
It would be nice to detect this dynamically, but gdb7 wouldn't work on
NetBSD 4 anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c

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



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

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 21:30:16 UTC 2011

Modified Files:
src/tests/lib/libc/sys: t_pipe2.c

Log Message:
make this work


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_pipe2.c

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



CVS commit: src/sys/kern

2011-10-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 31 21:31:29 UTC 2011

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

Log Message:
PR/45545 Yui NARUSE: pipe2's return value is wrong


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/kern/sys_descrip.c

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



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 23:10:16 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: shnbsd-tdep.c

Log Message:
shnbsd_software_single_step: fix logic botch.  Now that removal of
software single step breakpoints is handled by the caller we no longer
need to keep static next_pc around.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c

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



CVS commit: src/external/gpl3/gdb/dist/gdb

2011-10-31 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Mon Oct 31 23:30:27 UTC 2011

Modified Files:
src/external/gpl3/gdb/dist/gdb: shnbsd-tdep.c

Log Message:
Minor cosmetics to minimize diffs with vendor branch.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c

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



CVS commit: src/distrib/notes/common

2011-10-31 Thread Thomas Cort
Module Name:src
Committed By:   tcort
Date:   Tue Nov  1 02:04:44 UTC 2011

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

Log Message:
Add new developer Thomas Cort (tcort)


To generate a diff of this commit:
cvs rdiff -u -r1.481 -r1.482 src/distrib/notes/common/main

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