CVS commit: src/sys/arch/sandpoint

2009-07-29 Thread Tohru Nishimura 
Module Name:src
Committed By:   nisimura
Date:   Thu Jul 30 05:57:28 UTC 2009

Modified Files:
src/sys/arch/sandpoint/pci: pci_machdep.c
src/sys/arch/sandpoint/sandpoint: com_eumb.c

Log Message:
- fix EUMB com console attach case.
- #ifdef out pci_conf_interrupt() for PCI_NETBSD_CONFIGURE option.
Requested and tested by kiyohara.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/pci/pci_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/sandpoint/com_eumb.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/sandpoint/pci/pci_machdep.c
diff -u src/sys/arch/sandpoint/pci/pci_machdep.c:1.16 src/sys/arch/sandpoint/pci/pci_machdep.c:1.17
--- src/sys/arch/sandpoint/pci/pci_machdep.c:1.16	Fri May 30 19:26:35 2008
+++ src/sys/arch/sandpoint/pci/pci_machdep.c	Thu Jul 30 05:57:27 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.16 2008/05/30 19:26:35 ad Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.17 2009/07/30 05:57:27 nisimura Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -43,7 +43,9 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.16 2008/05/30 19:26:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.17 2009/07/30 05:57:27 nisimura Exp $");
+
+#include "opt_pci.h"
 
 #include 
 #include 
@@ -393,6 +395,7 @@
 	intr_disestablish(cookie);
 }
 
+#if defined(PCI_NETBSD_CONFIGURE)
 void
 pci_conf_interrupt(pci_chipset_tag_t pc, int bus, int dev,
 int pin, int swiz, int *iline)
@@ -420,3 +423,4 @@
 		*iline = 13 + ((swiz + dev + 3) & 3);
 	}
 }
+#endif

Index: src/sys/arch/sandpoint/sandpoint/com_eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.4 src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.5
--- src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.4	Mon Apr 28 20:23:34 2008
+++ src/sys/arch/sandpoint/sandpoint/com_eumb.c	Thu Jul 30 05:57:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: com_eumb.c,v 1.4 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: com_eumb.c,v 1.5 2009/07/30 05:57:27 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.4 2008/04/28 20:23:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.5 2009/07/30 05:57:27 nisimura Exp $");
 
 #include 
 #include 
@@ -89,10 +89,11 @@
 	found = 1;
 
 	comaddr = (eaa->eumb_unit == 1) ? 0x4600 : 0x4500;
-	if (comaddr == cnregs.cr_iobase)
+	if (com_is_console(eaa->eumb_bt, comaddr, &ioh)) {
+		cnregs.cr_ioh = ioh;
 		sc->sc_regs = cnregs;
+	}
 	else {
-		ioh = comaddr;
 		bus_space_map(eaa->eumb_bt, comaddr, COM_NPORTS, 0, &ioh);
 		COM_INIT_REGS(sc->sc_regs, eaa->eumb_bt, ioh, comaddr);
 	}
@@ -116,6 +117,5 @@
 	cnregs.cr_iot = tag;
 	cnregs.cr_iobase = conaddr;
 	cnregs.cr_nports = COM_NPORTS;
-	/* cnregs.ioh is initialized by comcnattach */
 	return comcnattach1(&cnregs, conspeed, confreq, contype, conmode);
 }

CVS commit: src/sbin/dkctl

2009-07-29 Thread S.P.Zeidler 
Module Name:src
Committed By:   spz
Date:   Thu Jul 30 05:54:43 UTC 2009

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

Log Message:
list the partition types addwedge understands, so you don't need to utsl
to find out what strings to use here
fixes PR 37252


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/dkctl/dkctl.8

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

Modified files:

Index: src/sbin/dkctl/dkctl.8
diff -u src/sbin/dkctl/dkctl.8:1.18 src/sbin/dkctl/dkctl.8:1.19
--- src/sbin/dkctl/dkctl.8:1.18	Sat Feb  7 17:13:32 2009
+++ src/sbin/dkctl/dkctl.8	Thu Jul 30 05:54:43 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: dkctl.8,v 1.18 2009/02/07 17:13:32 uebayasi Exp $
+.\"	$NetBSD: dkctl.8,v 1.19 2009/07/30 05:54:43 spz Exp $
 .\"
 .\" Copyright 2002 Wasabi Systems, Inc.
 .\" All rights reserved.
@@ -124,6 +124,24 @@
 .Ar name
 and the partition type
 .Ar ptype .
+Valid choices for ptype would be
+.Ar unused ,
+.Ar swap ,
+.Ar ffs ,
+.Ar lfs ,
+.Ar ext2fs ,
+.Ar cd9660 ,
+.Ar ados ,
+.Ar hfs ,
+.Ar msdos ,
+.Ar filecore ,
+.Ar raidframe ,
+.Ar ccd ,
+.Ar appleufs ,
+.Ar ntfs 
+and
+.Ar cgd .
+
 The device name of the virtual block device assigned to the wedge will be
 displayed after the wedge has been successfully created.
 See

CVS commit: src/sys/dev/pci

2009-07-29 Thread Michael Lorenz 
Module Name:src
Committed By:   macallan
Date:   Thu Jul 30 04:38:25 UTC 2009

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

Log Message:
do as elad suggested and call kauth instead of using INSECURE in pcimmap()


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/pci_usrreq.c

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

Modified files:

Index: src/sys/dev/pci/pci_usrreq.c
diff -u src/sys/dev/pci/pci_usrreq.c:1.21 src/sys/dev/pci/pci_usrreq.c:1.22
--- src/sys/dev/pci/pci_usrreq.c:1.21	Tue Jul 14 19:54:40 2009
+++ src/sys/dev/pci/pci_usrreq.c	Thu Jul 30 04:38:24 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_usrreq.c,v 1.21 2009/07/14 19:54:40 macallan Exp $	*/
+/*	$NetBSD: pci_usrreq.c,v 1.22 2009/07/30 04:38:24 macallan Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.21 2009/07/14 19:54:40 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.22 2009/07/30 04:38:24 macallan Exp $");
 
 #include 
 #include 
@@ -50,13 +50,13 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 
 #include "opt_pci.h"
-#include "opt_insecure.h"
 
 static int
 pciopen(dev_t dev, int flags, int mode, struct lwp *l)
@@ -113,9 +113,12 @@
 static paddr_t
 pcimmap(dev_t dev, off_t offset, int prot)
 {
-#ifdef INSECURE
 	struct pci_softc *sc = device_lookup_private(&pci_cd, minor(dev));
 
+	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+	NULL) != 0) {
+		return -1;
+	}
 	/*
 	 * Since we allow mapping of the entire bus, we
 	 * take the offset to be the address on the bus,
@@ -143,9 +146,6 @@
 	}
 #endif /* PCI_MAGIC_IO_RANGE */
 	return bus_space_mmap(sc->sc_memt, offset, 0, prot, 0);
-#else /* INSECURE */
-	return -1;
-#endif /* INSECURE */
 }
 
 const struct cdevsw pci_cdevsw = {

CVS commit: src/sys/dev/pci

2009-07-29 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Thu Jul 30 03:46:49 UTC 2009

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

Log Message:
Fix the bug that another lock mechanism is used to access Kumeran registers
on i80003 and ICHs.

Fix yet another i80003 ONLY workaround. The code to modifing TIPG register
is only for i80003.

Set the Re-Transmit on Late Collision(RTLC) flag for all devices.

Fix a typo in a printf message.


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/dev/pci/if_wm.c

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

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.177 src/sys/dev/pci/if_wm.c:1.178
--- src/sys/dev/pci/if_wm.c:1.177	Tue Jul 14 00:00:44 2009
+++ src/sys/dev/pci/if_wm.c	Thu Jul 30 03:46:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.177 2009/07/14 00:00:44 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.178 2009/07/30 03:46:48 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.177 2009/07/14 00:00:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.178 2009/07/30 03:46:48 msaitoh Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -566,8 +566,8 @@
 static int	wm_gmii_mediachange(struct ifnet *);
 static void	wm_gmii_mediastatus(struct ifnet *, struct ifmediareq *);
 
-static int	wm_kmrn_i80003_readreg(struct wm_softc *, int);
-static void	wm_kmrn_i80003_writereg(struct wm_softc *, int, int);
+static int	wm_kmrn_readreg(struct wm_softc *, int);
+static void	wm_kmrn_writereg(struct wm_softc *, int, int);
 
 static int	wm_match(device_t, cfdata_t, void *);
 static void	wm_attach(device_t, device_t, void *);
@@ -3308,12 +3308,12 @@
 			 * polling the phy; this fixes erroneous timeouts at
 			 * 10Mbps.
 			 */
-			wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_TIMEOUTS,
+			wm_kmrn_writereg(sc, KUMCTRLSTA_OFFSET_TIMEOUTS,
 			0x);
-			val = wm_kmrn_i80003_readreg(sc,
+			val = wm_kmrn_readreg(sc,
 			KUMCTRLSTA_OFFSET_INB_PARAM);
 			val |= 0x3F;
-			wm_kmrn_i80003_writereg(sc,
+			wm_kmrn_writereg(sc,
 			KUMCTRLSTA_OFFSET_INB_PARAM, val);
 			break;
 		default:
@@ -3326,11 +3326,11 @@
 			CSR_WRITE(sc, WMREG_CTRL_EXT, val);
 
 			/* Bypass RX and TX FIFO's */
-			wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_FIFO_CTRL,
+			wm_kmrn_writereg(sc, KUMCTRLSTA_OFFSET_FIFO_CTRL,
 			KUMCTRLSTA_FIFO_CTRL_RX_BYPASS | 
 			KUMCTRLSTA_FIFO_CTRL_TX_BYPASS);
 		
-			wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_INB_CTRL,
+			wm_kmrn_writereg(sc, KUMCTRLSTA_OFFSET_INB_CTRL,
 			KUMCTRLSTA_INB_CTRL_DIS_PADDING |
 			KUMCTRLSTA_INB_CTRL_LINK_TMOUT_DFLT);
 		}
@@ -3407,12 +3407,11 @@
 	 * a collision distance suitable for FDX, but update it whe
 	 * we resolve the media type.
 	 */
-	sc->sc_tctl = TCTL_EN | TCTL_PSP | TCTL_CT(TX_COLLISION_THRESHOLD) |
-	TCTL_COLD(TX_COLLISION_DISTANCE_FDX);
+	sc->sc_tctl = TCTL_EN | TCTL_PSP | TCTL_RTLC
+	| TCTL_CT(TX_COLLISION_THRESHOLD)
+	| TCTL_COLD(TX_COLLISION_DISTANCE_FDX);
 	if (sc->sc_type >= WM_T_82571)
 		sc->sc_tctl |= TCTL_MULR;
-	if (sc->sc_type >= WM_T_80003)
-		sc->sc_tctl |= TCTL_RTLC;
 	CSR_WRITE(sc, WMREG_TCTL, sc->sc_tctl);
 
 	if (sc->sc_type == WM_T_80003) {
@@ -5001,15 +5000,15 @@
 	CSR_WRITE(sc, WMREG_TCTL, sc->sc_tctl);
 	CSR_WRITE(sc, (sc->sc_type < WM_T_82543) ? WMREG_OLD_FCRTL
 		 : WMREG_FCRTL, sc->sc_fcrtl);
-	if (sc->sc_type >= WM_T_80003) {
+	if (sc->sc_type == WM_T_80003) {
 		switch(IFM_SUBTYPE(sc->sc_mii.mii_media_active)) {
 		case IFM_1000_T:
-			wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_HD_CTRL,
+			wm_kmrn_writereg(sc, KUMCTRLSTA_OFFSET_HD_CTRL,
 			KUMCTRLSTA_HD_CTRL_1000_DEFAULT);
 			sc->sc_tipg =  TIPG_1000T_80003_DFLT;
 			break;
 		default:
-			wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_HD_CTRL,
+			wm_kmrn_writereg(sc, KUMCTRLSTA_OFFSET_HD_CTRL,
 			KUMCTRLSTA_HD_CTRL_10_100_DEFAULT);
 			sc->sc_tipg =  TIPG_10_100_80003_DFLT;
 			break;
@@ -5019,20 +5018,27 @@
 }
 
 /*
- * wm_kmrn_i80003_readreg:
+ * wm_kmrn_readreg:
  *
  *	Read a kumeran register
  */
 static int
-wm_kmrn_i80003_readreg(struct wm_softc *sc, int reg)
+wm_kmrn_readreg(struct wm_softc *sc, int reg)
 {
-	int func = ((CSR_READ(sc, WMREG_STATUS) >> STATUS_FUNCID_SHIFT) & 1);
 	int rv;
 
-	if (wm_get_swfw_semaphore(sc, func ? SWFW_PHY1_SM : SWFW_PHY0_SM)) {
-		aprint_error_dev(sc->sc_dev, "%s: failed to get semaphore\n",
-		__func__);
-		return 0;
+	if (sc->sc_flags == WM_F_SWFW_SYNC) {
+		if (wm_get_swfw_semaphore(sc, SWFW_MAC_CSR_SM)) {
+			aprint_error_dev(sc->sc_dev,
+			"%s: failed to get semaphore\n", __func__);
+			return 0;
+		}
+	} else 	if (sc->sc_flags == WM_F_SWFWHW_SYNC) {
+		if (wm_get_swfwhw_semaphore(sc)) {
+			aprint_error_dev(sc->sc_dev,
+			"%s: failed to get semaphore\n", __func__);
+			return 0;
+		}
 	}

CVS commit: [netbsd-5-0] src

2009-07-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Wed Jul 29 22:35:18 UTC 2009

Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.1
src/gnu/usr.bin/groff/tmac [netbsd-5-0]: mdoc.local
src/sys/sys [netbsd-5-0]: param.h

Log Message:
Welcome to 5.0.1!


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-5.0.1
cvs rdiff -u -r1.43.4.8.2.1 -r1.43.4.8.2.2 \
src/gnu/usr.bin/groff/tmac/mdoc.local
cvs rdiff -u -r1.330.4.9.2.1 -r1.330.4.9.2.2 src/sys/sys/param.h

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

Modified files:

Index: src/doc/CHANGES-5.0.1
diff -u src/doc/CHANGES-5.0.1:1.1.2.43 src/doc/CHANGES-5.0.1:1.1.2.44
--- src/doc/CHANGES-5.0.1:1.1.2.43	Wed Jul 29 19:47:12 2009
+++ src/doc/CHANGES-5.0.1	Wed Jul 29 22:35:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.1,v 1.1.2.43 2009/07/29 19:47:12 snj Exp $
+# $NetBSD: CHANGES-5.0.1,v 1.1.2.44 2009/07/29 22:35:18 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1
 release:
@@ -722,3 +722,14 @@
 	Update copyright notice for 2009.
 	[rmind, ticket #882]
 
+distrib/notes/common/main			patch
+
+	Update for 5.0.1.
+	[snj]
+
+gnu/usr.bin/groff/tmac/mdoc.local		patch
+sys/sys/param.h	patch
+
+	Welcome to 5.0.1!
+	[snj]
+

Index: src/gnu/usr.bin/groff/tmac/mdoc.local
diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.8.2.1 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.8.2.2
--- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.8.2.1	Thu Apr 30 01:03:07 2009
+++ src/gnu/usr.bin/groff/tmac/mdoc.local	Wed Jul 29 22:35:18 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: mdoc.local,v 1.43.4.8.2.1 2009/04/30 01:03:07 snj Exp $
+.\" $NetBSD: mdoc.local,v 1.43.4.8.2.2 2009/07/29 22:35:18 snj Exp $
 .\"
 .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -44,9 +44,9 @@
 .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
 .
 .\" Default .Os value
-.ds doc-operating-system NetBSD\~5.0.0_PATCH
+.ds doc-operating-system NetBSD\~5.0.1
 .\" Default footer operating system value
-.ds doc-default-operating-system NetBSD\~5.0.0_PATCH
+.ds doc-default-operating-system NetBSD\~5.0.1
 .\" Other known versions, not yet in groff distribution
 .ds doc-operating-system-NetBSD-1.3.3  1.3.3
 .ds doc-operating-system-NetBSD-1.6.3  1.6.3

Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.330.4.9.2.1 src/sys/sys/param.h:1.330.4.9.2.2
--- src/sys/sys/param.h:1.330.4.9.2.1	Thu Apr 30 01:03:08 2009
+++ src/sys/sys/param.h	Wed Jul 29 22:35:18 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.330.4.9.2.1 2009/04/30 01:03:08 snj Exp $	*/
+/*	$NetBSD: param.h,v 1.330.4.9.2.2 2009/07/29 22:35:18 snj Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	50003	/* NetBSD 5.0.0_PATCH */
+#define	__NetBSD_Version__	50003	/* NetBSD 5.0.1 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

CVS commit: [netbsd-5-0] src/distrib/notes/common

2009-07-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Wed Jul 29 22:28:46 UTC 2009

Modified Files:
src/distrib/notes/common [netbsd-5-0]: main

Log Message:
Update for 5.0.1.


To generate a diff of this commit:
cvs rdiff -u -r1.425.2.5 -r1.425.2.5.2.1 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.425.2.5 src/distrib/notes/common/main:1.425.2.5.2.1
--- src/distrib/notes/common/main:1.425.2.5	Sun Apr 26 01:35:25 2009
+++ src/distrib/notes/common/main	Wed Jul 29 22:28:46 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.425.2.5 2009/04/26 01:35:25 snj Exp $
+.\"	$NetBSD: main,v 1.425.2.5.2.1 2009/07/29 22:28:46 snj Exp $
 .\"
 .\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -50,7 +50,7 @@
 .as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
 .so \*[.CURDIR]/../common/macros
 .
-.Dd April 25, 2009
+.Dd July 29, 2009
 .Dt INSTALL 8
 .Os NetBSD
 .Sh NAME
@@ -452,11 +452,213 @@
 wouldn't exist.
 .
 .if \n[FOR_RELEASE] \{\
+.Ss Changes Between The NetBSD 5.0 and 5.0.1 Releases
+.Pp
+The
+.Nx
+\*V
+release is the first security/critical update of the
+.Nx
+5.0 release branch.
+This represents a selected subset of fixes deemed critical in nature for
+stability or security reasons.
+.Pp
+Please note that all fixes in security/critical updates (i.e., NetBSD 5.0.1,
+5.0.2, etc.) are cumulative, so the latest update contains all such fixes
+since the corresponding minor release.
+These fixes will also appear in future minor releases (i.e., NetBSD 5.1, 5.2,
+etc.), together with other less-critical fixes and feature enhancements.
+.Pp
+The complete list of changes can be found in the
+CHANGES-5.0.1:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-5.0.1/CHANGES-5.0.1
+file in the top level directory of the NetBSD 5.0.1 release tree.
+An abbreviated list is as follows:
+.Ss2 Security Advisory Fixes
+.(bullet
+NetBSD-SA2009-004 (NetBSD OpenPAM passwd(1) changing weakness):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-004.txt.asc
+.It
+NetBSD-SA2009-005 (Plaintext Recovery Attack Against SSH):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-005.txt.asc
+.It
+NetBSD-SA2009-006 (Buffer overflows in ntp):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-006.txt.asc
+.It
+NetBSD-SA2009-007 (Buffer overflows in hack(6)):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-007.txt.asc
+.It
+NetBSD-SA2009-008 (OpenSSL ASN1 parsing denial of service and CMS signature
+verification weakness):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-008.txt.asc
+.It
+NetBSD-SA2009-009 (OpenSSL DTLS Memory Exhaustion and DSA signature
+verification vulnerabilities):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-009.txt.asc
+.It
+NetBSD-SA2009-010 (ISC dhclient subnet-mask flag stack overflow):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-010.txt.asc
+.It
+NetBSD-SA2009-011 (ISC DHCP server Denial of Service vulnerability):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-011.txt.asc
+.It
+NetBSD-SA2009-012 (SHA2 implementation potential buffer overflow):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-012.txt.asc
+.It
+NetBSD-SA2009-013 (BIND named dynamic update Denial of Service vulnerability):
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-013.txt.asc
+.bullet)
+.
+.Pp
+Advisories prior to NetBSD-SA2009-004 do not affect
+.Nx
+5.0:
+.Lk http://www.NetBSD.org/support/security/patches-5.0.html
+.Ss2 Kernel
+.(bullet
+Fix random
+.Dq filesystem full
+messages on large FFS file systems.
+.It
+Fix a regression in the 4.4BSD scheduler, improving interactive performance under load.
+.It
+Remove a race where physio_done() may use memory already freed.
+Fixes PR kern/39536.
+.It
+Fix a crash observed when trying to load a corrupted ELF kernel module.
+.It
+Fix PR kern/41566, where writes on the controlling tty were not being awoken from blocks.
+.It
+Various fixes for POSIX message queues.
+.It
+Fix a possible deadlock in the VFS subsystem.
+.It
+Fixes for POSIX advisory locks.
+.It
+A number of other stability fixes.
+.bullet)
+.
+.Ss2 Networking
+.(bullet
+Follow exactly the recommendation of draft-ietf-tcpm-tcpsecure-11.txt: Don't check gainst the last ack received, but the expected sequence number.
+This makes RST handling independent of delayed ACK.
+.It
+Fix a panic when trying to disable IPFilter before enabling it.
+Fixes PR kern/41364.
+.bullet)
+.
+.Ss2 Drivers
+.(bullet
+.Xr ehci 4 :
+Add a workaround for ATI SB600 and SB700 revisions A12 and A13 to avoid a USB subsystem hang when the system has multiple USB devices connected to it or one device is

CVS commit: src/sbin/ifconfig

2009-07-29 Thread Hubert Feyrer 
Module Name:src
Committed By:   hubertf
Date:   Wed Jul 29 21:47:11 UTC 2009

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

Log Message:
Add "MAC" keyword to the corresponding example.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sbin/ifconfig/ifconfig.8

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

Modified files:

Index: src/sbin/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.98 src/sbin/ifconfig/ifconfig.8:1.99
--- src/sbin/ifconfig/ifconfig.8:1.98	Thu Jul  2 18:43:47 2009
+++ src/sbin/ifconfig/ifconfig.8	Wed Jul 29 21:47:11 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ifconfig.8,v 1.98 2009/07/02 18:43:47 dyoung Exp $
+.\"	$NetBSD: ifconfig.8,v 1.99 2009/07/29 21:47:11 hubertf Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -819,7 +819,7 @@
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55
 .Pp
-Add and activate a link-layer address:
+Add and activate a link-layer (MAC) address:
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55 active
 .Sh DIAGNOSTICS

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

2009-07-29 Thread Hubert Feyrer 
Module Name:src
Committed By:   hubertf
Date:   Wed Jul 29 21:46:33 UTC 2009

Modified Files:
src/sbin/ifconfig [netbsd-5]: ifconfig.8

Log Message:
backout previous - wrong branch, thanks veego


To generate a diff of this commit:
cvs rdiff -u -r1.94.2.1 -r1.94.2.2 src/sbin/ifconfig/ifconfig.8

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

Modified files:

Index: src/sbin/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.94.2.1 src/sbin/ifconfig/ifconfig.8:1.94.2.2
--- src/sbin/ifconfig/ifconfig.8:1.94.2.1	Wed Jul 29 16:50:41 2009
+++ src/sbin/ifconfig/ifconfig.8	Wed Jul 29 21:46:33 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ifconfig.8,v 1.94.2.1 2009/07/29 16:50:41 hubertf Exp $
+.\"	$NetBSD: ifconfig.8,v 1.94.2.2 2009/07/29 21:46:33 hubertf Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -804,7 +804,7 @@
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55
 .Pp
-Add and activate a link-layer (MAC) address:
+Add and activate a link-layer address:
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55 active
 .Sh DIAGNOSTICS

CVS commit: [netbsd-5] src/doc

2009-07-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Wed Jul 29 19:48:59 UTC 2009

Modified Files:
src/doc [netbsd-5]: CHANGES-5.1

Log Message:
Ticket 882.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-5.1

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

Modified files:

Index: src/doc/CHANGES-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.53 src/doc/CHANGES-5.1:1.1.2.54
--- src/doc/CHANGES-5.1:1.1.2.53	Tue Jul 28 22:29:57 2009
+++ src/doc/CHANGES-5.1	Wed Jul 29 19:48:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.53 2009/07/28 22:29:57 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.54 2009/07/29 19:48:59 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -1666,3 +1666,8 @@
 	Fix CVE-2009-0696.
 	[christos, ticket #881]
 
+sys/conf/copyright1.6
+
+	Update copyright notice for 2009.
+	[rmind, ticket #882]
+

CVS commit: [netbsd-5] src/sys/conf

2009-07-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Wed Jul 29 19:47:59 UTC 2009

Modified Files:
src/sys/conf [netbsd-5]: copyright

Log Message:
Pull up following revision(s) (requested by rmind in ticket #882):
sys/conf/copyright: revision 1.6
Update copyright notice for 2009.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.20.1 src/sys/conf/copyright

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

Modified files:

Index: src/sys/conf/copyright
diff -u src/sys/conf/copyright:1.5 src/sys/conf/copyright:1.5.20.1
--- src/sys/conf/copyright:1.5	Tue Jan  1 00:00:18 2008
+++ src/sys/conf/copyright	Wed Jul 29 19:47:59 2009
@@ -1,5 +1,5 @@
 Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008
+2006, 2007, 2008, 2009
 The NetBSD Foundation, Inc.  All rights reserved.
 Copyright (c) 1982, 1986, 1989, 1991, 1993
 The Regents of the University of California.  All rights reserved.

CVS commit: [netbsd-5-0] src/doc

2009-07-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Wed Jul 29 19:47:12 UTC 2009

Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.1

Log Message:
Ticket 882.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.42 -r1.1.2.43 src/doc/CHANGES-5.0.1

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

Modified files:

Index: src/doc/CHANGES-5.0.1
diff -u src/doc/CHANGES-5.0.1:1.1.2.42 src/doc/CHANGES-5.0.1:1.1.2.43
--- src/doc/CHANGES-5.0.1:1.1.2.42	Tue Jul 28 22:25:58 2009
+++ src/doc/CHANGES-5.0.1	Wed Jul 29 19:47:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.1,v 1.1.2.42 2009/07/28 22:25:58 snj Exp $
+# $NetBSD: CHANGES-5.0.1,v 1.1.2.43 2009/07/29 19:47:12 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1
 release:
@@ -717,3 +717,8 @@
 	Fix CVE-2009-0696.
 	[christos, ticket #881]
 
+sys/conf/copyright1.6
+
+	Update copyright notice for 2009.
+	[rmind, ticket #882]
+

CVS commit: [netbsd-5-0] src/sys/conf

2009-07-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Wed Jul 29 19:46:14 UTC 2009

Modified Files:
src/sys/conf [netbsd-5-0]: copyright

Log Message:
Pull up following revision(s) (requested by rmind in ticket #882):
sys/conf/copyright: revision 1.6
Update copyright notice for 2009.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.24.1 src/sys/conf/copyright

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

Modified files:

Index: src/sys/conf/copyright
diff -u src/sys/conf/copyright:1.5 src/sys/conf/copyright:1.5.24.1
--- src/sys/conf/copyright:1.5	Tue Jan  1 00:00:18 2008
+++ src/sys/conf/copyright	Wed Jul 29 19:46:14 2009
@@ -1,5 +1,5 @@
 Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008
+2006, 2007, 2008, 2009
 The NetBSD Foundation, Inc.  All rights reserved.
 Copyright (c) 1982, 1986, 1989, 1991, 1993
 The Regents of the University of California.  All rights reserved.

CVS commit: src/sys/arch

2009-07-29 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Wed Jul 29 18:47:15 UTC 2009

Modified Files:
src/sys/arch/amd64/amd64: trap.c
src/sys/arch/i386/i386: trap.c

Log Message:
Reduce the difference between i386 and amd64 trap handler.
No functional changes intended.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.246 -r1.247 src/sys/arch/i386/i386/trap.c

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

Modified files:

Index: src/sys/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.58 src/sys/arch/amd64/amd64/trap.c:1.59
--- src/sys/arch/amd64/amd64/trap.c:1.58	Wed Jul 29 17:14:38 2009
+++ src/sys/arch/amd64/amd64/trap.c	Wed Jul 29 18:47:15 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.58 2009/07/29 17:14:38 rmind Exp $	*/
+/*	$NetBSD: trap.c,v 1.59 2009/07/29 18:47:15 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.58 2009/07/29 17:14:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.59 2009/07/29 18:47:15 rmind Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -81,12 +81,12 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
+#include 
 #include 
 #include 
 
@@ -114,7 +114,7 @@
 
 void trap(struct trapframe *);
 
-const char *trap_type[] = {
+const char * const trap_type[] = {
 	"privileged instruction fault",		/*  0 T_PRIVINFLT */
 	"breakpoint trap",			/*  1 T_BPTFLT */
 	"arithmetic trap",			/*  2 T_ARITHTRAP */
@@ -133,11 +133,11 @@
 	"invalid TSS fault",			/* 15 T_TSSFLT */
 	"segment not present fault",		/* 16 T_SEGNPFLT */
 	"stack fault",/* 17 T_STKFLT */
-	"machine check",			/* 18 T_MCA */
+	"machine check fault",			/* 18 T_MCA */
 	"SSE FP exception",			/* 19 T_XMM */
 	"reserved trap",			/* 20 T_RESERVED */
 };
-int	trap_types = sizeof trap_type / sizeof trap_type[0];
+int	trap_types = __arraycount(trap_type);
 
 #ifdef DEBUG
 int	trapdebug = 0;
@@ -177,20 +177,18 @@
 }
 
 /*
- * trap(frame):
- *	Exception, fault, and trap interface to BSD kernel. This
- * common code is called from assembly language IDT gate entry
- * routines that prepare a suitable stack frame, and restore this
- * frame after the exception has been processed. Note that the
- * effect is as if the arguments were passed call by reference.
+ * trap(frame): exception, fault, and trap interface to BSD kernel.
+ *
+ * This common code is called from assembly language IDT gate entry routines
+ * that prepare a suitable stack frame, and restore this frame after the
+ * exception has been processed. Note that the effect is as if the arguments
+ * were passed call by reference.
  */
-/*ARGSUSED*/
 void
 trap(struct trapframe *frame)
 {
 	struct lwp *l = curlwp;
 	struct proc *p;
-	int type = (int)frame->tf_trapno;
 	struct pcb *pcb;
 	extern char fusuintrfailure[], kcopy_fault[],
 		resume_iret[];
@@ -199,11 +197,11 @@
 	extern char resume_pop_ds[], resume_pop_es[];
 #endif
 	struct trapframe *vframe;
+	ksiginfo_t ksi;
 	void *resume;
 	void *onfault;
-	int error;
+	int type, error;
 	uint64_t cr2;
-	ksiginfo_t ksi;
 	bool pfail;
 
 	if (__predict_true(l != NULL)) {
@@ -216,18 +214,19 @@
 		pcb = NULL;
 		p = NULL;
 	}
+	type = frame->tf_trapno;
+
 #ifdef DEBUG
 	if (trapdebug) {
 		printf("trap %d code %lx eip %lx cs %lx rflags %lx cr2 %lx "
 		   "cpl %x\n",
 		type, frame->tf_err, frame->tf_rip, frame->tf_cs,
 		frame->tf_rflags, rcr2(), curcpu()->ci_ilevel);
-		printf("curlwp %p\n", curlwp);
+		printf("curlwp %p%s", curlwp, curlwp ? " " : "\n");
 		if (curlwp)
 			printf("pid %d lid %d\n", l->l_proc->p_pid, l->l_lid);
 	}
 #endif
-
 	if (type != T_NMI && !KERNELMODE(frame->tf_cs, frame->tf_rflags)) {
 		type |= T_USER;
 		l->l_md.md_regs = frame;
@@ -247,6 +246,10 @@
 		   " %lx cpl %x rsp %lx\n",
 		type, frame->tf_err, (u_long)frame->tf_rip, frame->tf_cs,
 		frame->tf_rflags, rcr2(), curcpu()->ci_ilevel, frame->tf_rsp);
+#ifdef DDB
+		if (kdb_trap(type, 0, frame))
+			return;
+#endif
 #ifdef KGDB
 		if (kgdb_trap(type, frame))
 			return;
@@ -261,10 +264,6 @@
 			}
 		}
 #endif
-#ifdef DDB
-		if (kdb_trap(type, 0, frame))
-			return;
-#endif
 		panic("trap");
 		/*NOTREACHED*/
 
@@ -364,9 +363,7 @@
 			ksi.ksi_code = SEGV_ACCERR;
 			break;
 		default:
-#ifdef DIAGNOSTIC
-			panic("unhandled type %x\n", type);
-#endif
+			KASSERT(0);
 			break;
 		}
 		goto trapsignal;
@@ -390,9 +387,7 @@
 			ksi.ksi_code = ILL_COPROC;
 			break;
 		default:
-#ifdef DIAGNOSTIC
-			panic("unhandled type %x\n", type);
-#endif
+			KASSERT(0);
 			break;
 		}
 		goto trapsignal;
@@ -408,8 +403,9 @@
 			ADDUPROF(l);
 		}
 		/* Allow a forced task switch. */
-		if (curcpu()->ci_want_resched)
+		if (curcpu()->ci_want_resched) {
 			preempt();
+		}
 		goto out;

CVS commit: src/sys/arch

2009-07-29 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Wed Jul 29 17:45:39 UTC 2009

Modified Files:
src/sys/arch/hp300/include: cpu.h
src/sys/arch/news68k/include: cpu.h
src/sys/arch/powerpc/powerpc: trap.c

Log Message:
Fix few more l_pflag and LP_OWEUPC confusions.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/powerpc/powerpc/trap.c

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

Modified files:

Index: src/sys/arch/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.59 src/sys/arch/hp300/include/cpu.h:1.60
--- src/sys/arch/hp300/include/cpu.h:1.59	Wed Feb 27 18:26:15 2008
+++ src/sys/arch/hp300/include/cpu.h	Wed Jul 29 17:45:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.59 2008/02/27 18:26:15 xtraeme Exp $	*/
+/*	$NetBSD: cpu.h,v 1.60 2009/07/29 17:45:39 rmind Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -159,7 +159,7 @@
  * through trap, marking the proc as needing a profiling tick.
  */
 #define	cpu_need_proftick(l)	\
-	do { (l)->l_flag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
+	do { (l)->l_pflag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
 
 /*
  * Notify the current process (p) that it has a signal pending,

Index: src/sys/arch/news68k/include/cpu.h
diff -u src/sys/arch/news68k/include/cpu.h:1.33 src/sys/arch/news68k/include/cpu.h:1.34
--- src/sys/arch/news68k/include/cpu.h:1.33	Wed Feb 27 18:26:16 2008
+++ src/sys/arch/news68k/include/cpu.h	Wed Jul 29 17:45:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.33 2008/02/27 18:26:16 xtraeme Exp $	*/
+/*	$NetBSD: cpu.h,v 1.34 2009/07/29 17:45:39 rmind Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -174,7 +174,7 @@
  * through trap, marking the proc as needing a profiling tick.
  */
 #define cpu_need_proftick(l)	\
-	do { (l)->l_flag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
+	do { (l)->l_pflag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
 
 /*
  * Notify the current process (p) that it has a signal pending,

Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.129 src/sys/arch/powerpc/powerpc/trap.c:1.130
--- src/sys/arch/powerpc/powerpc/trap.c:1.129	Fri Dec 19 15:20:10 2008
+++ src/sys/arch/powerpc/powerpc/trap.c	Wed Jul 29 17:45:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.129 2008/12/19 15:20:10 njoly Exp $	*/
+/*	$NetBSD: trap.c,v 1.130 2009/07/29 17:45:39 rmind Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.129 2008/12/19 15:20:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.130 2009/07/29 17:45:39 rmind Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -342,7 +342,7 @@
 		ci->ci_astpending = 0;		/* we are about to do it */
 		uvmexp.softs++;
 		if (l->l_pflag & LP_OWEUPC) {
-			l->l_flag &= ~LP_OWEUPC;
+			l->l_pflag &= ~LP_OWEUPC;
 			ADDUPROF(l);
 		}
 		/* Check whether we are being preempted. */

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

2009-07-29 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Wed Jul 29 17:16:56 UTC 2009

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

Log Message:
Fix KASSERT(1);


To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 src/sys/arch/i386/i386/trap.c

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

Modified files:

Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.245 src/sys/arch/i386/i386/trap.c:1.246
--- src/sys/arch/i386/i386/trap.c:1.245	Wed Jul 29 12:02:06 2009
+++ src/sys/arch/i386/i386/trap.c	Wed Jul 29 17:16:56 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.245 2009/07/29 12:02:06 cegger Exp $	*/
+/*	$NetBSD: trap.c,v 1.246 2009/07/29 17:16:56 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.245 2009/07/29 12:02:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.246 2009/07/29 17:16:56 rmind Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -483,7 +483,7 @@
 			ksi.ksi_code = BUS_ADRALN;
 			break;
 		default:
-			KASSERT(1);
+			KASSERT(0);
 			break;
 		}
 		goto trapsignal;

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

2009-07-29 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Wed Jul 29 17:14:38 UTC 2009

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

Log Message:
T_ASTFLT|T_USER: check for LP_OWEUPC in l_lpflag, not l_flag.  Also, flag
unset was on p->p_flag.  Luckily, it did not corrupt the p_flag, because
we don't have LW_ flag matching LP_OWEUPC.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amd64/amd64/trap.c

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

Modified files:

Index: src/sys/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.57 src/sys/arch/amd64/amd64/trap.c:1.58
--- src/sys/arch/amd64/amd64/trap.c:1.57	Thu Jul 16 14:21:12 2009
+++ src/sys/arch/amd64/amd64/trap.c	Wed Jul 29 17:14:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.57 2009/07/16 14:21:12 christos Exp $	*/
+/*	$NetBSD: trap.c,v 1.58 2009/07/29 17:14:38 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.57 2009/07/16 14:21:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.58 2009/07/29 17:14:38 rmind Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -400,10 +400,11 @@
 	case T_ARITHTRAP|T_USER:
 	case T_XMM|T_USER:
 		/* Already handled by fputrap(), fall through. */
-	case T_ASTFLT|T_USER:		/* Allow process switch */
+	case T_ASTFLT|T_USER:
+		/* Allow process switch. */
 		uvmexp.softs++;
-		if (l->l_flag & LP_OWEUPC) {
-			p->p_flag &= ~LP_OWEUPC;
+		if (l->l_pflag & LP_OWEUPC) {
+			l->l_pflag &= ~LP_OWEUPC;
 			ADDUPROF(l);
 		}
 		/* Allow a forced task switch. */

CVS commit: src/sys/fs/nilfs

2009-07-29 Thread Reinoud Zandijk 
Module Name:src
Committed By:   reinoud
Date:   Wed Jul 29 17:06:57 UTC 2009

Modified Files:
src/sys/fs/nilfs: nilfs_subr.c

Log Message:
Re-do nilfs_load_super_root() and implement crc checking of read in super root
to check for consistency.

Since a new crc-seed is chosen on each new nilfs formatting, older structures
will fail the crc check.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nilfs/nilfs_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/fs/nilfs/nilfs_subr.c
diff -u src/sys/fs/nilfs/nilfs_subr.c:1.3 src/sys/fs/nilfs/nilfs_subr.c:1.4
--- src/sys/fs/nilfs/nilfs_subr.c:1.3	Wed Jul 29 13:23:23 2009
+++ src/sys/fs/nilfs/nilfs_subr.c	Wed Jul 29 17:06:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_subr.c,v 1.3 2009/07/29 13:23:23 reinoud Exp $ */
+/* $NetBSD: nilfs_subr.c,v 1.4 2009/07/29 17:06:57 reinoud Exp $ */
 
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
 
 #include 
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.3 2009/07/29 13:23:23 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.4 2009/07/29 17:06:57 reinoud Exp $");
 #endif /* not lint */
 
 #include 
@@ -502,13 +502,13 @@
 	struct nilfs_recover_info *ri)
 {
 	struct nilfs_segment_summary *segsum = &ri->segsum;
+	struct nilfs_super_root *super_root;
 	struct buf *bp;
 	uint64_t blocknr, offset;
 	uint32_t segsum_size, size;
 	uint32_t nsumblk, nfileblk;
-	int error;
-
-	bp = NULL;
+	uint32_t super_root_crc, comp_crc;
+	int off, error;
 
 	/* process segment summary */
 	segsum_size = nilfs_rw32(segsum->ss_sumbytes);
@@ -519,29 +519,39 @@
 	if ((nilfs_rw16(segsum->ss_flags) & NILFS_SS_SR) == 0) {
 		DPRINTF(VOLUMES, ("nilfs: no super root in pseg %"PRIu64"\n",
 			ri->pseg));
-		error = ENOENT;
-		goto out;
+		return ENOENT;
 	}
 
 	/* get our super root, located at the end of the pseg */
 	blocknr = ri->pseg + nsumblk + nfileblk - 1;
 	offset = 0;
 	size = sizeof(struct nilfs_super_root);
+	bp = NULL;
 	error = nilfs_get_segment_log(nilfsdev,
 			&blocknr, &offset, &bp,
 			size, (void *) &nilfsdev->super_root);
+	if (bp)
+		brelse(bp, BC_AGE);
 	if (error) {
 		printf("read in of superroot failed\n");
-		error = EIO;
+		return EIO;
 	}
-	/* else got our super root! */
-	DPRINTF(VOLUMES, ("got superroot\n"));
 
-out:
-	if (bp)
-		brelse(bp, BC_AGE);
+	/* check super root crc */
+	super_root = &nilfsdev->super_root;
+	super_root_crc = nilfs_rw32(super_root->sr_sum);
+	off = sizeof(super_root->sr_sum);
+	comp_crc = crc32_le(nilfs_rw32(nilfsdev->super.s_crc_seed),
+		(uint8_t *) super_root + off,
+		NILFS_SR_BYTES - off);
+	if (super_root_crc != comp_crc) {
+		DPRINTF(VOLUMES, ("invalid superroot, likely from old format\n"));
+		return EINVAL;
+	}
 
-	return error;
+	DPRINTF(VOLUMES, ("got valid superroot\n"));
+
+	return 0;
 }
 
 /*

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

2009-07-29 Thread Hubert Feyrer 
Module Name:src
Committed By:   hubertf
Date:   Wed Jul 29 16:50:41 UTC 2009

Modified Files:
src/sbin/ifconfig [netbsd-5]: ifconfig.8

Log Message:
Add "MAC" keyword to the corresponding example.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.94.2.1 src/sbin/ifconfig/ifconfig.8

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

Modified files:

Index: src/sbin/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.94 src/sbin/ifconfig/ifconfig.8:1.94.2.1
--- src/sbin/ifconfig/ifconfig.8:1.94	Tue Sep 30 09:41:41 2008
+++ src/sbin/ifconfig/ifconfig.8	Wed Jul 29 16:50:41 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ifconfig.8,v 1.94 2008/09/30 09:41:41 wiz Exp $
+.\"	$NetBSD: ifconfig.8,v 1.94.2.1 2009/07/29 16:50:41 hubertf Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -804,7 +804,7 @@
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55
 .Pp
-Add and activate a link-layer address:
+Add and activate a link-layer (MAC) address:
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55 active
 .Sh DIAGNOSTICS

CVS commit: src/sys/dev/usb

2009-07-29 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Wed Jul 29 16:04:14 UTC 2009

Modified Files:
src/sys/dev/usb: usb_quirks.c

Log Message:
Without UQ_ASSUME_CM_OVER_DATA, the PANTECH UM175 has a
non-working bulk-in endpoint


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/usb/usb_quirks.c

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

Modified files:

Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.64 src/sys/dev/usb/usb_quirks.c:1.65
--- src/sys/dev/usb/usb_quirks.c:1.64	Fri Apr 24 14:16:50 2009
+++ src/sys/dev/usb/usb_quirks.c	Wed Jul 29 16:04:14 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_quirks.c,v 1.64 2009/04/24 14:16:50 jakllsch Exp $	*/
+/*	$NetBSD: usb_quirks.c,v 1.65 2009/07/29 16:04:14 jakllsch Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.64 2009/04/24 14:16:50 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.65 2009/07/29 16:04:14 jakllsch Exp $");
 
 #include 
 #include 
@@ -130,6 +130,8 @@
 	ANY, { UQ_ASSUME_CM_OVER_DATA }},
  { USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_CDMA_MSM,
 	ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_HYUNDAI, USB_PRODUCT_HYUNDAI_UM175,
+	ANY, { UQ_ASSUME_CM_OVER_DATA }},
  { 0, 0, 0, { 0 } }
 };

CVS commit: src/sys/dev/usb

2009-07-29 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Wed Jul 29 15:47:26 UTC 2009

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

Log Message:
Regenerate.


To generate a diff of this commit:
cvs rdiff -u -r1.524 -r1.525 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.525 -r1.526 src/sys/dev/usb/usbdevs_data.h

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

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.524 src/sys/dev/usb/usbdevs.h:1.525
--- src/sys/dev/usb/usbdevs.h:1.524	Sun Jun 28 10:46:37 2009
+++ src/sys/dev/usb/usbdevs.h	Wed Jul 29 15:47:26 2009
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.524 2009/06/28 10:46:37 mbalmer Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.525 2009/07/29 15:47:26 jakllsch Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.529 2009/06/28 10:45:24 mbalmer Exp
+ *	NetBSD: usbdevs,v 1.530 2009/07/29 15:45:17 jakllsch Exp
  */
 
 /*
@@ -432,6 +432,7 @@
 #define	USB_VENDOR_GIGABYTE	0x1044		/* GIGABYTE */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
+#define	USB_VENDOR_HYUNDAI	0x106c		/* Hyundai CuriTel */
 #define	USB_VENDOR_SILABS2	0x10a6		/* SILABS2 */
 #define	USB_VENDOR_USI	0x10ab		/* USI */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
@@ -1245,6 +1246,10 @@
 /* Huawei-3Com products */
 #define	USB_PRODUCT_HUAWEI3COM_RT2573	0x0009		/* RT2573 */
 
+/* Hyundai CuriTel (Audiovox, Pantech) products */
+#define	USB_PRODUCT_HYUNDAI_PC5740	0x3701		/* PC5740 EVDO */
+#define	USB_PRODUCT_HYUNDAI_UM175	0x3714		/* UM175 EVDO */
+
 /* IBM Corporation */
 #define	USB_PRODUCT_IBM_OPTTRAVELMOUSE	0x3107		/* Optical */
 #define	USB_PRODUCT_IBM_USBCDROMDRIVE	0x4427		/* USB CD-ROM Drive */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.525 src/sys/dev/usb/usbdevs_data.h:1.526
--- src/sys/dev/usb/usbdevs_data.h:1.525	Sun Jun 28 10:46:37 2009
+++ src/sys/dev/usb/usbdevs_data.h	Wed Jul 29 15:47:26 2009
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.525 2009/06/28 10:46:37 mbalmer Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.526 2009/07/29 15:47:26 jakllsch Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.529 2009/06/28 10:45:24 mbalmer Exp
+ *	NetBSD: usbdevs,v 1.530 2009/07/29 15:45:17 jakllsch Exp
  */
 
 /*
@@ -1507,6 +1507,10 @@
 	"CCYU Technology",
 	},
 	{
+	USB_VENDOR_HYUNDAI,
+	"Hyundai CuriTel",
+	},
+	{
 	USB_VENDOR_SILABS2,
 	"SILABS2",
 	},
@@ -1871,7 +1875,7 @@
 	"GNU Radio USRP",
 	},
 };
-const int usb_nvendors = 458;
+const int usb_nvendors = 459;
 
 const struct usb_product usb_products[] = {
 	{
@@ -3687,6 +3691,14 @@
 	"RT2573",
 	},
 	{
+	USB_VENDOR_HYUNDAI, USB_PRODUCT_HYUNDAI_PC5740,
+	"PC5740 EVDO",
+	},
+	{
+	USB_VENDOR_HYUNDAI, USB_PRODUCT_HYUNDAI_UM175,
+	"UM175 EVDO",
+	},
+	{
 	USB_VENDOR_IBM, USB_PRODUCT_IBM_OPTTRAVELMOUSE,
 	"Optical",
 	},
@@ -6903,4 +6915,4 @@
 	"Prestige",
 	},
 };
-const int usb_nproducts = 1257;
+const int usb_nproducts = 1259;

CVS commit: src/sys/dev/usb

2009-07-29 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Wed Jul 29 15:45:17 UTC 2009

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

Log Message:
Add entries for some Hyundai CuriTel (Audiovox, Pantech) products, from OpenBSD.


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

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.529 src/sys/dev/usb/usbdevs:1.530
--- src/sys/dev/usb/usbdevs:1.529	Sun Jun 28 10:45:24 2009
+++ src/sys/dev/usb/usbdevs	Wed Jul 29 15:45:17 2009
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.529 2009/06/28 10:45:24 mbalmer Exp $
+$NetBSD: usbdevs,v 1.530 2009/07/29 15:45:17 jakllsch Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -425,6 +425,7 @@
 vendor GIGABYTE		0x1044	GIGABYTE
 vendor MOTOROLA		0x1063	Motorola
 vendor CCYU		0x1065	CCYU Technology
+vendor HYUNDAI		0x106c	Hyundai CuriTel
 vendor SILABS2		0x10a6	SILABS2
 vendor USI		0x10ab	USI
 vendor PLX		0x10b5	PLX
@@ -1238,6 +1239,10 @@
 /* Huawei-3Com products */
 product HUAWEI3COM RT2573	0x0009	RT2573
 
+/* Hyundai CuriTel (Audiovox, Pantech) products */
+product HYUNDAI PC5740		0x3701	PC5740 EVDO
+product HYUNDAI UM175		0x3714	UM175 EVDO
+
 /* IBM Corporation */
 product IBM OPTTRAVELMOUSE	0x3107	Optical
 product IBM USBCDROMDRIVE	0x4427	USB CD-ROM Drive

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

2009-07-29 Thread Christoph Egger 
Module Name:src
Committed By:   cegger
Date:   Wed Jul 29 13:37:57 UTC 2009

Modified Files:
src/sys/arch/i386/conf: XEN3_DOM0 XEN3_DOMU

Log Message:
nuke unused XEN3 option. The XEN option is sufficient now.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/conf/XEN3_DOM0 \
src/sys/arch/i386/conf/XEN3_DOMU

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

Modified files:

Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.17 src/sys/arch/i386/conf/XEN3_DOM0:1.18
--- src/sys/arch/i386/conf/XEN3_DOM0:1.17	Mon Apr 20 20:49:21 2009
+++ src/sys/arch/i386/conf/XEN3_DOM0	Wed Jul 29 13:37:57 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3_DOM0,v 1.17 2009/04/20 20:49:21 cegger Exp $
+#	$NetBSD: XEN3_DOM0,v 1.18 2009/07/29 13:37:57 cegger Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -14,7 +14,6 @@
 
 #
 options 	XEN
-options 	XEN3	#Xen 3.x support
 #options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface
 
 # boot messages with MPBIOS, acpi and ioapic can be quite large
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.17 src/sys/arch/i386/conf/XEN3_DOMU:1.18
--- src/sys/arch/i386/conf/XEN3_DOMU:1.17	Sat Jul 18 16:31:42 2009
+++ src/sys/arch/i386/conf/XEN3_DOMU	Wed Jul 29 13:37:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.17 2009/07/18 16:31:42 reinoud Exp $
+# $NetBSD: XEN3_DOMU,v 1.18 2009/07/29 13:37:57 cegger Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -161,7 +161,6 @@
 #options 	NFS_BOOTSTATIC_SERVADDR="\"169.254.1.1\""
 #options 	NFS_BOOTSTATIC_SERVER="\"server:/path/to/root\""
 
-options 	XEN3	#Xen 3.x support
 #options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface
 options 	XEN_COMPAT_030001  #compatible with Xen3 before 3.0.2
 options 	MAXPHYS=32768   #xbd doesn't handle 64k transfers

CVS commit: src/sys/fs/nilfs

2009-07-29 Thread Reinoud Zandijk 
Module Name:src
Committed By:   reinoud
Date:   Wed Jul 29 13:23:23 UTC 2009

Modified Files:
src/sys/fs/nilfs: nilfs_subr.c

Log Message:
Add debugging text to indicate a super root has been found while searching for
it.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nilfs/nilfs_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/fs/nilfs/nilfs_subr.c
diff -u src/sys/fs/nilfs/nilfs_subr.c:1.2 src/sys/fs/nilfs/nilfs_subr.c:1.3
--- src/sys/fs/nilfs/nilfs_subr.c:1.2	Tue Jul 28 15:31:21 2009
+++ src/sys/fs/nilfs/nilfs_subr.c	Wed Jul 29 13:23:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_subr.c,v 1.2 2009/07/28 15:31:21 reinoud Exp $ */
+/* $NetBSD: nilfs_subr.c,v 1.3 2009/07/29 13:23:23 reinoud Exp $ */
 
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
 
 #include 
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.2 2009/07/28 15:31:21 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.3 2009/07/29 13:23:23 reinoud Exp $");
 #endif /* not lint */
 
 #include 
@@ -535,6 +535,7 @@
 		error = EIO;
 	}
 	/* else got our super root! */
+	DPRINTF(VOLUMES, ("got superroot\n"));
 
 out:
 	if (bp)

CVS commit: src/doc

2009-07-29 Thread Christoph Egger 
Module Name:src
Committed By:   cegger
Date:   Wed Jul 29 12:04:14 UTC 2009

Modified Files:
src/doc: CHANGES

Log Message:
NetBSD/Xen no longer supports Xen2


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

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1263 src/doc/CHANGES:1.1264
--- src/doc/CHANGES:1.1263	Tue Jul 28 21:23:47 2009
+++ src/doc/CHANGES	Wed Jul 29 12:04:14 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1263 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1264 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -344,3 +344,4 @@
 		[kiyohara 20090615]
 	dhcpcd(8): Import dhcpcd-5.0.7. [roy 20090728]
 	bind: Update to 9.6.1-P1.  [christos 20090728]
+	xen: dropped Xen 2 support. [cegger 20090728]

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

2009-07-29 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Wed Jul 29 11:58:31 UTC 2009

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

Log Message:
Fix (commented out) gpioow usage.


To generate a diff of this commit:
cvs rdiff -u -r1.939 -r1.940 src/sys/arch/i386/conf/GENERIC

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

Modified files:

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.939 src/sys/arch/i386/conf/GENERIC:1.940
--- src/sys/arch/i386/conf/GENERIC:1.939	Wed Jul 29 11:55:40 2009
+++ src/sys/arch/i386/conf/GENERIC	Wed Jul 29 11:58:31 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.939 2009/07/29 11:55:40 mbalmer Exp $
+# $NetBSD: GENERIC,v 1.940 2009/07/29 11:58:31 mbalmer Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.939 $"
+#ident 		"GENERIC-$Revision: 1.940 $"
 
 maxusers	64		# estimated number of users
 
@@ -675,7 +675,8 @@
 #gpio*	at gpiosim?
 
 # 1-Wire support
-#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
+#gpioow* 	at gpio? offset ? mask ?	# 1-wire bitbanging via gpio
+#gpioow* 	at gpio?
 #onewire*	at gpioow?
 
 # 1-Wire devices

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

2009-07-29 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Wed Jul 29 11:55:40 UTC 2009

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

Log Message:
Add commented out entries for gpiosim and gpio at gpiosim.


To generate a diff of this commit:
cvs rdiff -u -r1.938 -r1.939 src/sys/arch/i386/conf/GENERIC

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

Modified files:

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.938 src/sys/arch/i386/conf/GENERIC:1.939
--- src/sys/arch/i386/conf/GENERIC:1.938	Mon Jul 27 12:34:13 2009
+++ src/sys/arch/i386/conf/GENERIC	Wed Jul 29 11:55:40 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.938 2009/07/27 12:34:13 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.939 2009/07/29 11:55:40 mbalmer Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.938 $"
+#ident 		"GENERIC-$Revision: 1.939 $"
 
 maxusers	64		# estimated number of users
 
@@ -672,6 +672,7 @@
 
 # GPIO devices
 #gpio*	at gscpcib?
+#gpio*	at gpiosim?
 
 # 1-Wire support
 #gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
@@ -1518,6 +1519,7 @@
 pseudo-device	lockstat		# lock profiling
 pseudo-device	bcsp			# BlueCore Serial Protocol
 pseudo-device	btuart			# Bluetooth HCI UART (H4)
+#pseudo-device	gpiosim		1	# GPIO simulator
 
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda		4	# coda minicache <-> venus comm.

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

2009-07-29 Thread Marc Balmer 
Module Name:src
Committed By:   mbalmer
Date:   Wed Jul 29 11:52:45 UTC 2009

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

Log Message:
Add pseudo-device gpiosim, fix gpioow usage.


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/sys/arch/i386/conf/ALL

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/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.202 src/sys/arch/i386/conf/ALL:1.203
--- src/sys/arch/i386/conf/ALL:1.202	Mon Jul 27 12:34:13 2009
+++ src/sys/arch/i386/conf/ALL	Wed Jul 29 11:52:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.202 2009/07/27 12:34:13 kiyohara Exp $
+# $NetBSD: ALL,v 1.203 2009/07/29 11:52:44 mbalmer Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ALL-$Revision: 1.202 $"
+#ident 		"ALL-$Revision: 1.203 $"
 
 maxusers	32		# estimated number of users
 
@@ -680,9 +680,10 @@
 
 # GPIO devices
 gpio*	at gscpcib?
+gpio*	at gpiosim?
 
 # 1-Wire support
-gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
+gpioow* 	at gpio? offset ? mask ?	# 1-wire bitbanging via gpio
 onewire*	at gpioow?
 
 # 1-Wire devices
@@ -1516,6 +1517,7 @@
 pseudo-device	ksyms			# /dev/ksyms
 pseudo-device	bcsp			# BlueCore Serial Protocol
 pseudo-device	btuart			# Bluetooth HCI UART (H4)
+pseudo-device	gpiosim		1	# GPIO simulator
 
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda		4	# coda minicache <-> venus comm.