CVS commit: src/share/mk

2012-05-25 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Fri May 25 10:48:48 UTC 2012

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

Log Message:
Document MKREPRO here as well.


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/share/mk/bsd.README

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

Modified files:

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.294 src/share/mk/bsd.README:1.295
--- src/share/mk/bsd.README:1.294	Wed Feb 29 20:07:57 2012
+++ src/share/mk/bsd.README	Fri May 25 10:48:48 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.294 2012/02/29 20:07:57 tron Exp $
+#	$NetBSD: bsd.README,v 1.295 2012/05/25 10:48:48 wiz Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make include files for the NetBSD
@@ -313,6 +313,11 @@ MKPOSTFIX	If no, don't build or instal
 MKPROFILE	If no, don't build or install the profiling (*_p.a) libraries.
 		Default: yes
 
+MKREPRO If yes, create reproducable builds. This enables
+		different switches to make two builds from the same source tree
+		result in the same build results.
+		Default: no
+
 MKSHARE		If no, act as MKCATPAGES=no MKDOC=no MKHTML=no MKINFO=no
 		MKMAN=no MKNLS=no.
 		I.e, don't build catman pages, documentation, Info

CVS commit: src/sys/dev

2012-05-25 Thread Roland Dowdeswell 
Module Name:src
Committed By:   elric
Date:   Fri May 25 10:53:46 UTC 2012

Modified Files:
src/sys/dev: cgd.c cgdvar.h dksubr.c dkvar.h

Log Message:
Modify dksubr.c to add a function that sets the disk properties in
the drvctl framework.  And call this new functionality from cgd(4),
the consumer of dksubr.c.  We do this to allow gpt(8) to be able
to label cgd(4) disks.  We also add in some DIOCGSECTORSIZE logic
and we ensure that the WEDGE ioctls are not called on either
uninitialised disks or disks which have not been opened for write
access.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/cgd.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cgdvar.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/dksubr.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dkvar.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/cgd.c
diff -u src/sys/dev/cgd.c:1.76 src/sys/dev/cgd.c:1.77
--- src/sys/dev/cgd.c:1.76	Sun Nov 13 23:03:24 2011
+++ src/sys/dev/cgd.c	Fri May 25 10:53:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.76 2011/11/13 23:03:24 christos Exp $ */
+/* $NetBSD: cgd.c,v 1.77 2012/05/25 10:53:46 elric Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.76 2011/11/13 23:03:24 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.77 2012/05/25 10:53:46 elric Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -185,9 +185,9 @@ cgd_attach(device_t parent, device_t sel
 {
 	struct cgd_softc *sc = device_private(self);
 
-	sc-sc_dev = self;
 	simple_lock_init(sc-sc_slock);
-	dk_sc_init(sc-sc_dksc, sc, device_xname(sc-sc_dev));
+	dk_sc_init(sc-sc_dksc, device_xname(self));
+	sc-sc_dksc.sc_dev = self;
 	disk_init(sc-sc_dksc.sc_dkdev, sc-sc_dksc.sc_xname, cgddkdriver);
 
 	 if (!pmf_device_register(self, NULL, NULL))
@@ -278,8 +278,8 @@ cgdclose(dev_t dev, int flags, int fmt, 
 		return error;
 
 	if ((dksc-sc_flags  DKF_INITED) == 0) {
-		if ((error = cgd_destroy(cs-sc_dev)) != 0) {
-			aprint_error_dev(cs-sc_dev,
+		if ((error = cgd_destroy(cs-sc_dksc.sc_dev)) != 0) {
+			aprint_error_dev(dksc-sc_dev,
 			unable to detach instance\n);
 			return error;
 		}
@@ -336,7 +336,7 @@ cgdsize(dev_t dev)
 static void *
 cgd_getdata(struct dk_softc *dksc, unsigned long size)
 {
-	struct	cgd_softc *cs =dksc-sc_osc;
+	struct	cgd_softc *cs = (struct cgd_softc *)dksc;
 	void *	data = NULL;
 
 	simple_lock(cs-sc_slock);
@@ -355,7 +355,7 @@ cgd_getdata(struct dk_softc *dksc, unsig
 static void
 cgd_putdata(struct dk_softc *dksc, void *data)
 {
-	struct	cgd_softc *cs =dksc-sc_osc;
+	struct	cgd_softc *cs = (struct cgd_softc *)dksc;
 
 	if (data == cs-sc_data) {
 		simple_lock(cs-sc_slock);
@@ -369,7 +369,7 @@ cgd_putdata(struct dk_softc *dksc, void 
 static int
 cgdstart(struct dk_softc *dksc, struct buf *bp)
 {
-	struct	cgd_softc *cs = dksc-sc_osc;
+	struct	cgd_softc *cs = (struct cgd_softc *)dksc;
 	struct	buf *nbp;
 	void *	addr;
 	void *	newaddr;
@@ -681,6 +681,8 @@ cgd_ioctl_set(struct cgd_softc *cs, void
 
 	cs-sc_dksc.sc_flags |= DKF_INITED;
 
+	dk_set_properties(di, cs-sc_dksc);
+
 	/* Attach the disk. */
 	disk_attach(cs-sc_dksc.sc_dkdev);
 

Index: src/sys/dev/cgdvar.h
diff -u src/sys/dev/cgdvar.h:1.14 src/sys/dev/cgdvar.h:1.15
--- src/sys/dev/cgdvar.h:1.14	Tue Jan 12 21:08:09 2010
+++ src/sys/dev/cgdvar.h	Fri May 25 10:53:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdvar.h,v 1.14 2010/01/12 21:08:09 dyoung Exp $ */
+/* $NetBSD: cgdvar.h,v 1.15 2012/05/25 10:53:46 elric Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -69,7 +69,6 @@ struct cryptdata {
 };
 
 struct cgd_softc {
-	device_t		sc_dev;
 	struct dk_softc		 sc_dksc;	/* generic disk interface */
 	struct cryptinfo	*sc_crypt;	/* the alg/key/etc */
 	struct vnode		*sc_tvn;	/* target device's vnode */

Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.42 src/sys/dev/dksubr.c:1.43
--- src/sys/dev/dksubr.c:1.42	Fri Nov 19 06:44:39 2010
+++ src/sys/dev/dksubr.c	Fri May 25 10:53:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.42 2010/11/19 06:44:39 dholland Exp $ */
+/* $NetBSD: dksubr.c,v 1.43 2012/05/25 10:53:46 elric Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.42 2010/11/19 06:44:39 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.43 2012/05/25 10:53:46 elric Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -48,7 +48,9 @@ __KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1
 
 #include dev/dkvar.h
 
-int	dkdebug = 0;
+int	dkdebug = 0xff;
+
+#define DEBUG 1
 
 #ifdef DEBUG
 #define DKDB_FOLLOW	0x1
@@ -70,11 +72,10 @@ int	dkdebug = 0;
 static void	dk_makedisklabel(struct dk_intf *, struct dk_softc *);
 
 void
-dk_sc_init(struct dk_softc *dksc, void *osc, const char *xname)

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

2012-05-25 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Fri May 25 12:32:49 UTC 2012

Modified Files:
src/sys/arch/vax/include: types.h userret.h

Log Message:
Implement __HAVE_RAS.  Unlike most implementation, this is done in userret
instead of cpu_switchto since we already accessing the proc structure so
the additional overhead of check p_raslist is minimal.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/vax/include/types.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/include/userret.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/vax/include/types.h
diff -u src/sys/arch/vax/include/types.h:1.44 src/sys/arch/vax/include/types.h:1.45
--- src/sys/arch/vax/include/types.h:1.44	Tue Jan 17 20:34:57 2012
+++ src/sys/arch/vax/include/types.h	Fri May 25 12:32:48 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.44 2012/01/17 20:34:57 joerg Exp $	*/
+/*	$NetBSD: types.h,v 1.45 2012/05/25 12:32:48 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -78,6 +78,9 @@ typedef volatile char	__cpu_simple_lock_
 #define	__HAVE_CPU_DATA_FIRST
 #define	__HAVE_MM_MD_READWRITE
 #define	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
+#ifdef _KERNEL
+#define	__HAVE_RAS
+#endif
 
 #define	__HAVE___LWP_GETPRIVATE_FAST
 #define	__HAVE_NO___THREAD

Index: src/sys/arch/vax/include/userret.h
diff -u src/sys/arch/vax/include/userret.h:1.13 src/sys/arch/vax/include/userret.h:1.14
--- src/sys/arch/vax/include/userret.h:1.13	Sun Jul  3 02:18:20 2011
+++ src/sys/arch/vax/include/userret.h	Fri May 25 12:32:48 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: userret.h,v 1.13 2011/07/03 02:18:20 matt Exp $	*/
+/*	$NetBSD: userret.h,v 1.14 2012/05/25 12:32:48 matt Exp $	*/
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,6 +31,7 @@
  */
 
 #include sys/userret.h
+#include sys/ras.h
 
 /*
  *	Common code used by various exception handlers to
@@ -44,6 +45,15 @@ userret(struct lwp *l, struct trapframe 
 	mi_userret(l);
 
 	/*
+	 * Check to see if a RAS was interrupted and restart it if it was.
+	 */
+	if (__predict_false(p-p_raslist != NULL)) {
+		void * const ras_pc = ras_lookup(p, (void *) tf-tf_pc);
+		if (ras_pc != (void *) -1)
+			tf-tf_pc = (vaddr_t) ras_pc;
+	}
+
+	/*
 	 * If profiling, charge system time to the trapped pc.
 	 */
 	if ((p-p_stflag  PST_PROFIL) != 0) {

CVS commit: src/sys/dev

2012-05-25 Thread Roland Dowdeswell 
Module Name:src
Committed By:   elric
Date:   Fri May 25 14:25:39 UTC 2012

Modified Files:
src/sys/dev: dksubr.c

Log Message:
Revert a few lines of accidental commit.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.43 src/sys/dev/dksubr.c:1.44
--- src/sys/dev/dksubr.c:1.43	Fri May 25 10:53:46 2012
+++ src/sys/dev/dksubr.c	Fri May 25 14:25:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.43 2012/05/25 10:53:46 elric Exp $ */
+/* $NetBSD: dksubr.c,v 1.44 2012/05/25 14:25:39 elric Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.43 2012/05/25 10:53:46 elric Exp $);
+__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.44 2012/05/25 14:25:39 elric Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -48,9 +48,7 @@ __KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1
 
 #include dev/dkvar.h
 
-int	dkdebug = 0xff;
-
-#define DEBUG 1
+int	dkdebug = 0;
 
 #ifdef DEBUG
 #define DKDB_FOLLOW	0x1

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

2012-05-25 Thread Ryo Shimizu 
Module Name:src
Committed By:   ryo
Date:   Fri May 25 14:59:17 UTC 2012

Modified Files:
src/sys/arch/evbmips/conf: CPMBR1400

Log Message:
fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/conf/CPMBR1400

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/evbmips/conf/CPMBR1400
diff -u src/sys/arch/evbmips/conf/CPMBR1400:1.8 src/sys/arch/evbmips/conf/CPMBR1400:1.9
--- src/sys/arch/evbmips/conf/CPMBR1400:1.8	Sat Mar 10 21:51:51 2012
+++ src/sys/arch/evbmips/conf/CPMBR1400	Fri May 25 14:59:16 2012
@@ -156,7 +156,7 @@ options 	PFIL_HOOKS	# pfil(9) packet fil
 #options 	MEMORY_RBFLAGS=0		# keep the kernel from forcing single user mode
 
 # Options for NFS root boot
-options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM,NFS_BOOT_STATIC
+options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM,NFS_BOOT_BOOTSTATIC
 #options 	NFS_BOOTSTATIC_MYIP=\192.168.0.1\
 #options 	NFS_BOOTSTATIC_GWIP=\192.168.0.1\
 #options 	NFS_BOOTSTATIC_MASK=\255.255.255.0\

CVS commit: src/sys/arch/xen/xen

2012-05-25 Thread Roland Dowdeswell 
Module Name:src
Committed By:   elric
Date:   Fri May 25 15:03:38 UTC 2012

Modified Files:
src/sys/arch/xen/xen: xbd_xenbus.c

Log Message:
Update xdb_xenbus.c to new usage of routines in dksubr.c.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/xen/xen/xbd_xenbus.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/xen/xen/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.56 src/sys/arch/xen/xen/xbd_xenbus.c:1.57
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.56	Wed Feb 22 16:53:46 2012
+++ src/sys/arch/xen/xen/xbd_xenbus.c	Fri May 25 15:03:38 2012
@@ -1,4 +1,4 @@
-/*  $NetBSD: xbd_xenbus.c,v 1.56 2012/02/22 16:53:46 jakllsch Exp $  */
+/*  $NetBSD: xbd_xenbus.c,v 1.57 2012/05/25 15:03:38 elric Exp $  */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbd_xenbus.c,v 1.56 2012/02/22 16:53:46 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbd_xenbus.c,v 1.57 2012/05/25 15:03:38 elric Exp $);
 
 #include opt_xen.h
 
@@ -122,9 +122,7 @@ struct xbd_req {
 #define req_sync	u.req_sync
 
 struct xbd_xenbus_softc {
-	device_t sc_dev;
-	struct dk_softc sc_dksc;
-	struct dk_intf *sc_di;
+	struct dk_softc sc_dksc;	/* Must be first in this struct */
 	struct xenbus_device *sc_xbusd;
 
 	blkif_front_ring_t sc_ring;
@@ -212,7 +210,7 @@ static struct dk_intf dkintf_esdi = {
 	xbdclose,
 	xbdstrategy,
 	xbdstart,
-};
+}, *di = dkintf_esdi;
 
 static struct dkdriver xbddkdriver = {
 .d_strategy = xbdstrategy,
@@ -251,7 +249,8 @@ xbd_xenbus_attach(device_t parent, devic
 	config_pending_incr();
 	aprint_normal(: Xen Virtual Block Device Interface\n);
 
-	sc-sc_dev = self;
+	dk_sc_init(sc-sc_dksc, device_xname(self));
+	sc-sc_dksc.sc_dev = self;
 
 #ifdef XBD_DEBUG
 	printf(path: %s\n, xa-xa_xbusd-xbusd_path);
@@ -278,9 +277,7 @@ xbd_xenbus_attach(device_t parent, devic
 	sc-sc_xbusd = xa-xa_xbusd;
 	sc-sc_xbusd-xbusd_otherend_changed = xbd_backend_changed;
 
-	dk_sc_init(sc-sc_dksc, sc, device_xname(self));
 	disk_init(sc-sc_dksc.sc_dkdev, device_xname(self), xbddkdriver);
-	sc-sc_di = dkintf_esdi;
 	/* initialize free requests list */
 	SLIST_INIT(sc-sc_xbdreq_head);
 	for (i = 0; i  XBD_RING_SIZE; i++) {
@@ -521,7 +518,7 @@ static void xbd_backend_changed(void *ar
 	char buf[9];
 	int s;
 	DPRINTF((%s: new backend state %d\n,
-	device_xname(sc-sc_dev), new_state));
+	device_xname(sc-sc_dksc.sc_dev), new_state));
 
 	switch (new_state) {
 	case XenbusStateUnknown:
@@ -571,9 +568,9 @@ static void xbd_backend_changed(void *ar
 		sc-sc_backend_status = BLKIF_STATE_CONNECTED;
 
 		/* try to read the disklabel */
-		dk_getdisklabel(sc-sc_di, sc-sc_dksc, 0 /* XXX ? */);
+		dk_getdisklabel(di, sc-sc_dksc, 0 /* XXX ? */);
 		format_bytes(buf, sizeof(buf), sc-sc_sectors * sc-sc_secsize);
-		aprint_verbose_dev(sc-sc_dev,
+		aprint_verbose_dev(sc-sc_dksc.sc_dev,
 %s, %d bytes/sect x % PRIu64  sectors\n,
 buf, (int)pdg-pdg_secsize, sc-sc_xbdsize);
 		/* Discover wedges on this disk. */
@@ -593,7 +590,7 @@ static void xbd_backend_changed(void *ar
 		pdg-pdg_ncylinders);
 		prop_dictionary_set(disk_info, geometry, geom);
 		prop_object_release(geom);
-		prop_dictionary_set(device_properties(sc-sc_dev),
+		prop_dictionary_set(device_properties(sc-sc_dksc.sc_dev),
 		disk-info, disk_info);
 		/*
 		 * Don't release disk_info here; we keep a reference to it.
@@ -623,24 +620,28 @@ xbd_connect(struct xbd_xenbus_softc *sc)
 	sc-sc_xbusd-xbusd_path, virtual-device, sc-sc_handle, 10);
 	if (err)
 		panic(%s: can't read number from %s/virtual-device\n, 
-		device_xname(sc-sc_dev), sc-sc_xbusd-xbusd_otherend);
+		device_xname(sc-sc_dksc.sc_dev),
+		sc-sc_xbusd-xbusd_otherend);
 	err = xenbus_read_ull(NULL,
 	sc-sc_xbusd-xbusd_otherend, sectors, sectors, 10);
 	if (err)
 		panic(%s: can't read number from %s/sectors\n, 
-		device_xname(sc-sc_dev), sc-sc_xbusd-xbusd_otherend);
+		device_xname(sc-sc_dksc.sc_dev),
+		sc-sc_xbusd-xbusd_otherend);
 	sc-sc_sectors = sectors;
 
 	err = xenbus_read_ul(NULL,
 	sc-sc_xbusd-xbusd_otherend, info, sc-sc_info, 10);
 	if (err)
 		panic(%s: can't read number from %s/info\n, 
-		device_xname(sc-sc_dev), sc-sc_xbusd-xbusd_otherend);
+		device_xname(sc-sc_dksc.sc_dev),
+		sc-sc_xbusd-xbusd_otherend);
 	err = xenbus_read_ul(NULL,
 	sc-sc_xbusd-xbusd_otherend, sector-size, sc-sc_secsize, 10);
 	if (err)
 		panic(%s: can't read number from %s/sector-size\n, 
-		device_xname(sc-sc_dev), sc-sc_xbusd-xbusd_otherend);
+		device_xname(sc-sc_dksc.sc_dev),
+		sc-sc_xbusd-xbusd_otherend);
 
 	err = xenbus_read_ul(NULL, sc-sc_xbusd-xbusd_otherend,
 	feature-flush-cache, cache_flush, 10);
@@ -663,7 +664,7 @@ xbd_handler(void *arg)
 	int more_to_do;
 	int seg;
 
-	DPRINTF((xbd_handler(%s)\n,

CVS commit: src/share/man/man4

2012-05-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri May 25 15:54:03 UTC 2012

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

Log Message:
Add dumb description about options NFS_BOOT_BOOTSTATIC.  Noticed by ryo@.


To generate a diff of this commit:
cvs rdiff -u -r1.415 -r1.416 src/share/man/man4/options.4

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

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.415 src/share/man/man4/options.4:1.416
--- src/share/man/man4/options.4:1.415	Thu Mar 22 20:34:38 2012
+++ src/share/man/man4/options.4	Fri May 25 15:54:02 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: options.4,v 1.415 2012/03/22 20:34:38 drochner Exp $
+.\	$NetBSD: options.4,v 1.416 2012/05/25 15:54:02 tsutsui Exp $
 .\
 .\ Copyright (c) 1996
 .\ 	Perry E. Metzger.  All rights reserved.
@@ -30,7 +30,7 @@
 .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\
 .\
-.Dd March 21, 2012
+.Dd May 25, 2012
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -1018,6 +1018,15 @@ information if NFS is used to mount the 
 See
 .Xr diskless 8
 for details.
+.It Cd options NFS_BOOT_BOOTSTATIC
+Enable use of static values defined as
+.Dq NFS_BOOTSTATIC_MYIP ,
+.Dq NFS_BOOTSTATIC_GWIP ,
+.Dq NFS_BOOTSTATIC_SERVADDR ,
+and
+.Dq NFS_BOOTSTATIC_SERVER
+in kernel options to get configuration information
+if NFS is used to mount the root file system.
 .It Cd options NFS_BOOT_DHCP
 Same as
 .Dq NFS_BOOT_BOOTP ,

CVS commit: src/sys/dev/usb

2012-05-25 Thread Brian Buhrow 
Module Name:src
Committed By:   buhrow
Date:   Fri May 25 16:29:37 UTC 2012

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

Log Message:
Regen after successful build release
(Includes Apple iPod Touch (4th generation)
and
Springer Design's TTSMP3 players


To generate a diff of this commit:
cvs rdiff -u -r1.607 -r1.608 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.608 -r1.609 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.607 src/sys/dev/usb/usbdevs.h:1.608
--- src/sys/dev/usb/usbdevs.h:1.607	Thu May 17 21:59:49 2012
+++ src/sys/dev/usb/usbdevs.h	Fri May 25 16:29:37 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.607 2012/05/17 21:59:49 cyber Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.608 2012/05/25 16:29:37 buhrow Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.614 2012/05/17 21:48:22 cyber Exp
+ *	NetBSD: usbdevs,v 1.616 2012/05/24 21:32:35 buhrow Exp
  */
 
 /*
@@ -558,6 +558,7 @@
 #define	USB_VENDOR_ONSPEC2	0x55aa		/* OnSpec Electronic Inc. */
 #define	USB_VENDOR_ZINWELL	0x5a57		/* Zinwell */
 #define	USB_VENDOR_SITECOM	0x6189		/* Sitecom */
+#define	USB_VENDOR_SPRINGERDESIGN	0x6400		/* Springer Design, Inc. */
 #define	USB_VENDOR_ARKMICROCHIPS	0x6547		/* ArkMicroChips */
 #define	USB_VENDOR_3COM2	0x6891		/* 3Com */
 #define	USB_VENDOR_EDIMAX	0x7392		/* EDIMAX */
@@ -809,8 +810,10 @@
 #define	USB_PRODUCT_APPLE_BLUETOOTH_HIDMODE	0x1000		/* Bluetooth HCI (HID-proxy mode) */
 #define	USB_PRODUCT_APPLE_EXT_KBD_HUB	0x1003		/* Hub in Apple Extended USB Keyboard */
 #define	USB_PRODUCT_APPLE_SPEAKERS	0x1101		/* Speakers */
+#define	USB_PRODUCT_APPLE_SHUFFLE2	0x1301		/* iPod Shuffle (2nd generation) */
 #define	USB_PRODUCT_APPLE_IPHONE	0x1290		/* iPhone */
 #define	USB_PRODUCT_APPLE_IPOD_TOUCH	0x1291		/* iPod Touch */
+#define	USB_PRODUCT_APPLE_IPOD_TOUCH_4G	0x129e		/* iPod Touch 4G */
 #define	USB_PRODUCT_APPLE_IPHONE_3G	0x1292		/* iPhone 3G */
 #define	USB_PRODUCT_APPLE_IPHONE_3GS	0x1294		/* iPhone 3GS */
 #define	USB_PRODUCT_APPLE_IPAD	0x129a		/* Apple iPad */
@@ -2711,6 +2714,9 @@
 #define	USB_PRODUCT_SPARKLAN_RT2870_1	0x0006		/* RT2870 */
 #define	USB_PRODUCT_SPARKLAN_RT3070	0x0010		/* RT3070 */
 
+/*Springer Design Systems Inc.*/
+#define	USB_PRODUCT_SPRINGERDESIGN_TTSMP3PLAYER	0x		/* Springer Design TTSMP3Player */
+
 /* Sphairon Access Systems GmbH products */
 #define	USB_PRODUCT_SPHAIRON_UB801R	0x0110		/* UB801R */
 #define	USB_PRODUCT_SPHAIRON_RTL8187	0x0150		/* RTL8187 */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.608 src/sys/dev/usb/usbdevs_data.h:1.609
--- src/sys/dev/usb/usbdevs_data.h:1.608	Thu May 17 21:59:49 2012
+++ src/sys/dev/usb/usbdevs_data.h	Fri May 25 16:29:37 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.608 2012/05/17 21:59:49 cyber Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.609 2012/05/25 16:29:37 buhrow Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.614 2012/05/17 21:48:22 cyber Exp
+ *	NetBSD: usbdevs,v 1.616 2012/05/24 21:32:35 buhrow Exp
  */
 
 /*
@@ -2011,6 +2011,10 @@ const struct usb_vendor usb_vendors[] = 
 	Sitecom,
 	},
 	{
+	USB_VENDOR_SPRINGERDESIGN,
+	Springer Design, Inc.,
+	},
+	{
 	USB_VENDOR_ARKMICROCHIPS,
 	ArkMicroChips,
 	},
@@ -2051,7 +2055,7 @@ const struct usb_vendor usb_vendors[] = 
 	GNU Radio USRP,
 	},
 };
-const int usb_nvendors = 503;
+const int usb_nvendors = 504;
 
 const struct usb_product usb_products[] = {
 	{
@@ -2707,6 +2711,10 @@ const struct usb_product usb_products[] 
 	Speakers,
 	},
 	{
+	USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SHUFFLE2,
+	iPod Shuffle (2nd generation),
+	},
+	{
 	USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE,
 	iPhone,
 	},
@@ -2715,6 +2723,10 @@ const struct usb_product usb_products[] 
 	iPod Touch,
 	},
 	{
+	USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_4G,
+	iPod Touch 4G,
+	},
+	{
 	USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G,
 	iPhone 3G,
 	},
@@ -8131,6 +8143,10 @@ const struct usb_product usb_products[] 
 	RT3070,
 	},
 	{
+	USB_VENDOR_SPRINGERDESIGN, USB_PRODUCT_SPRINGERDESIGN_TTSMP3PLAYER,
+	Springer Design TTSMP3Player,
+	},
+	{
 	USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R,
 	UB801R,
 	},
@@ -8859,4 +8875,4 @@ const struct usb_product usb_products[] 
 	Prestige,
 	},
 };
-const int usb_nproducts = 1701;
+const int usb_nproducts = 1704;

CVS commit: src/sys/dev/usb

2012-05-25 Thread Brian Buhrow 
Module Name:src
Committed By:   buhrow
Date:   Fri May 25 16:33:54 UTC 2012

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

Log Message:
Added the Apple iPod Touch (4th generation)
to the list of Apple devices with bogus uhid and uaudio matches.
It now attaches as a ugen device.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 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.74 src/sys/dev/usb/usb_quirks.c:1.75
--- src/sys/dev/usb/usb_quirks.c:1.74	Sat Feb 11 05:27:23 2012
+++ src/sys/dev/usb/usb_quirks.c	Fri May 25 16:33:54 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_quirks.c,v 1.74 2012/02/11 05:27:23 plunky Exp $	*/
+/*	$NetBSD: usb_quirks.c,v 1.75 2012/05/25 16:33:54 buhrow 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 sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_quirks.c,v 1.74 2012/02/11 05:27:23 plunky Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_quirks.c,v 1.75 2012/05/25 16:33:54 buhrow Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -129,6 +129,8 @@ Static const struct usbd_quirk_entry {
 	ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
  { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH,
 	ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
+ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_4G,
+	ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
  { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G,
 	ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
  { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3GS,

CVS commit: src/sys/dev/pci

2012-05-25 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Fri May 25 18:18:32 UTC 2012

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add some Intel I350 Ethernet products.


To generate a diff of this commit:
cvs rdiff -u -r1.1116 -r1.1117 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1116 src/sys/dev/pci/pcidevs:1.1117
--- src/sys/dev/pci/pcidevs:1.1116	Wed Apr 18 21:21:59 2012
+++ src/sys/dev/pci/pcidevs	Fri May 25 18:18:32 2012
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1116 2012/04/18 21:21:59 bouyer Exp $
+$NetBSD: pcidevs,v 1.1117 2012/05/25 18:18:32 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2571,6 +2571,10 @@ product INTEL 82580_COPPER_DUAL	0x1516	8
 product INTEL 82576_NS_SERDES 	0x1518	82576 gigabit Ethernet (SERDES)
 product INTEL 82580_ER 		0x151d	82580 1000BaseT Ethernet
 product INTEL 82580_ER_DUAL 	0x151e	82580 dual-1000BaseT Ethernet
+product INTEL I350_COPPER 	0x1521	I350 Gigabit Network Connection
+product INTEL I350_FIBER 	0x1522	I350 Gigabit Fiber Network Connection
+product INTEL I350_SERDES 	0x1523	I350 Gigabit Backplane Connection
+product INTEL I350_SGMII 	0x1524	I350 Gigabit Connection
 product INTEL 82801J_D_BM_V	0x1525	82567V LAN Controller
 product INTEL 82580_QUAD_FIBER 	0x1527	82580 quad-1000BaseX Ethernet
 product INTEL 80960_RP		0x1960	ROB-in i960RP Microprocessor

CVS commit: src

2012-05-25 Thread John Nemeth 
Module Name:src
Committed By:   jnemeth
Date:   Fri May 25 21:46:13 UTC 2012

Modified Files:
src/distrib/sets/lists/base: rescue.mi
src/rescue: list

Log Message:
PR/46393 - Nat Sloss -- add gpt(8) to /rescue


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.42 -r1.43 src/rescue/list

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

Modified files:

Index: src/distrib/sets/lists/base/rescue.mi
diff -u src/distrib/sets/lists/base/rescue.mi:1.33 src/distrib/sets/lists/base/rescue.mi:1.34
--- src/distrib/sets/lists/base/rescue.mi:1.33	Sat Apr  7 05:55:00 2012
+++ src/distrib/sets/lists/base/rescue.mi	Fri May 25 21:46:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: rescue.mi,v 1.33 2012/04/07 05:55:00 christos Exp $
+# $NetBSD: rescue.mi,v 1.34 2012/05/25 21:46:13 jnemeth Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -46,6 +46,7 @@
 ./rescue/fsdb	base-rescue-root
 ./rescue/fsirandbase-rescue-root
 ./rescue/ftp	base-rescue-root
+./rescue/gpt	base-rescue-root
 ./rescue/grep	base-rescue-root
 ./rescue/gunzip	base-rescue-root
 ./rescue/gzcat	base-rescue-root

Index: src/rescue/list
diff -u src/rescue/list:1.42 src/rescue/list:1.43
--- src/rescue/list:1.42	Sun Jul  3 22:05:01 2011
+++ src/rescue/list	Fri May 25 21:46:13 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.42 2011/07/03 22:05:01 tron Exp $
+#	$NetBSD: list,v 1.43 2012/05/25 21:46:13 jnemeth Exp $
 
 SRCDIRS	bin
 
@@ -60,6 +60,7 @@ PROG	fsck_lfs
 PROG	fsck_msdos
 PROG	fsdb
 PROG	fsirand
+PROG	gpt
 PROG	ifconfig
 PROG	init		init.bak
 PROG	lmcconfig

CVS commit: src

2012-05-25 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Fri May 25 23:37:38 UTC 2012

Modified Files:
src/share/man/man4: wm.4
src/sys/dev/pci: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
Add support Intel I350 Ethernet.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/share/man/man4/wm.4
cvs rdiff -u -r1.227 -r1.228 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_wmvar.h

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

Modified files:

Index: src/share/man/man4/wm.4
diff -u src/share/man/man4/wm.4:1.21 src/share/man/man4/wm.4:1.22
--- src/share/man/man4/wm.4:1.21	Sat Apr 23 16:46:51 2011
+++ src/share/man/man4/wm.4	Fri May 25 23:37:37 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: wm.4,v 1.21 2011/04/23 16:46:51 tron Exp $
+.\	$NetBSD: wm.4,v 1.22 2012/05/25 23:37:37 msaitoh Exp $
 .\
 .\ Copyright 2002, 2003 Wasabi Systems, Inc.
 .\ All rights reserved.
@@ -120,11 +120,27 @@ Intel i82572 1000BASE-T Ethernet
 .It
 Intel i82573 1000BASE-T Ethernet
 .It
+Intel i82575 1000BASE-T Ethernet
+.It
+Intel i82576 Ethernet (Copper, Fiber)
+.It
+Intel i80003 Ethernet (Copper, Fiber)
+.It
 Intel i82801H (ICH8 LAN) 1000BASE-T Ethernet
 .It
 Intel i82801I (ICH9 LAN) 1000BASE-T Ethernet
 .It
-Intel i80003 1000BASE-T Ethernet
+Intel i82801J (ICH10 LAN) 1000BASE-T Ethernet
+.It
+Intel PCH 1000BASE-T Ethernet
+.It
+Intel PCH2 1000BASE-T Ethernet
+.It
+Intel 82580 Ethernet (Copper, Fiber)
+.It
+Intel 82583 1000BASE-T Ethernet
+.It
+Intel I350 Ethernet (Copper, Fiber)
 .El
 .Pp
 In addition to Intel's own

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.227 src/sys/dev/pci/if_wm.c:1.228
--- src/sys/dev/pci/if_wm.c:1.227	Thu Feb  2 19:43:05 2012
+++ src/sys/dev/pci/if_wm.c	Fri May 25 23:37:38 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.227 2012/02/02 19:43:05 tls Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.228 2012/05/25 23:37:38 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227 2012/02/02 19:43:05 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.228 2012/05/25 23:37:38 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -603,6 +603,7 @@ static void	wm_enable_phy_wakeup(struct 
 static void	wm_enable_wakeup(struct wm_softc *);
 #endif
 static void	wm_init_manageability(struct wm_softc *);
+static void	wm_set_eee_i350(struct wm_softc *);
 
 CFATTACH_DECL3_NEW(wm, sizeof(struct wm_softc),
 wm_match, wm_attach, wm_detach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
@@ -1001,6 +1002,20 @@ static const struct wm_product {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82580_QUAD_FIBER,
 	  82580 quad-1000BaseX Ethernet,
 	  WM_T_82580,		WMP_F_1000X },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_COPPER,
+	  I350 Gigabit Network Connection,
+	  WM_T_I350,		WMP_F_1000T },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_FIBER,
+	  I350 Gigabit Fiber Network Connection,
+	  WM_T_I350,		WMP_F_1000X },
+#if 0
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_SERDES,
+	  I350 Gigabit Backplane Connection,
+	  WM_T_I350,		WMP_F_SERDES },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_SGMII,
+	  I350 Gigabit Connection,
+	  WM_T_I350,		WMP_F_1000T },
+#endif
 	{ 0,			0,
 	  NULL,
 	  0,			0 },
@@ -1151,7 +1166,8 @@ wm_attach(device_t parent, device_t self
 	}
 
 	if ((sc-sc_type == WM_T_82575) || (sc-sc_type == WM_T_82576)
-	|| (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER))
+	|| (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER)
+	|| (sc-sc_type == WM_T_I350))
 		sc-sc_flags |= WM_F_NEWQUEUE;
 
 	/* Set device properties (mactype) */
@@ -1264,7 +1280,8 @@ wm_attach(device_t parent, device_t self
 	if ((sc-sc_type == WM_T_82546) || (sc-sc_type == WM_T_82546_3)
 	|| (sc-sc_type ==  WM_T_82571) || (sc-sc_type == WM_T_80003)
 	|| (sc-sc_type == WM_T_82575) || (sc-sc_type == WM_T_82576)
-	|| (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER))
+	|| (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER)
+	|| (sc-sc_type == WM_T_I350))
 		sc-sc_funcid = (CSR_READ(sc, WMREG_STATUS)
 		 STATUS_FUNCID_SHIFT)  STATUS_FUNCID_MASK;
 	else
@@ -1551,6 +1568,7 @@ wm_attach(device_t parent, device_t self
 	case WM_T_82576:
 	case WM_T_82580:
 	case WM_T_82580ER:
+	case WM_T_I350:
 	case WM_T_80003:
 		/* SPI */
 		wm_set_spiaddrbits(sc);
@@ -1696,11 +1714,13 @@ wm_attach(device_t parent, device_t self
 	case WM_T_82576:
 	case WM_T_82580:
 	case WM_T_82580ER:
+	case WM_T_I350:
 	case WM_T_ICH8:
 	case WM_T_ICH9:
 	case WM_T_ICH10:
 	case WM_T_PCH:
 	case WM_T_PCH2:
+		/* XXX The funcid should be checked on some devices */
 		apme_mask = WUC_APME;
 		eeprom_data = CSR_READ(sc, WMREG_WUC);
 		break;
@@ -1818,6 +1838,7 @@ wm_attach(device_t parent, device_t self
 		case WM_T_82576:
 		case

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

2012-05-25 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat May 26 00:31:07 UTC 2012

Modified Files:
src/sys/arch/powerpc/include: types.h userret.h

Log Message:
Add __HAVE_RAS support.  Do it in userret.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/include/userret.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/powerpc/include/types.h
diff -u src/sys/arch/powerpc/include/types.h:1.46 src/sys/arch/powerpc/include/types.h:1.47
--- src/sys/arch/powerpc/include/types.h:1.46	Sun Jul 17 23:23:54 2011
+++ src/sys/arch/powerpc/include/types.h	Sat May 26 00:31:07 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.46 2011/07/17 23:23:54 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.47 2012/05/26 00:31:07 matt Exp $	*/
 
 /*-
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -95,5 +95,8 @@ typedef volatile __uint32_t __cpuset_t;
 
 #define	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 #define	__HAVE_MM_MD_KERNACC
+#if defined(_KERNEL)
+#define	__HAVE_RAS
+#endif
 
 #endif	/* _MACHTYPES_H_ */

Index: src/sys/arch/powerpc/include/userret.h
diff -u src/sys/arch/powerpc/include/userret.h:1.23 src/sys/arch/powerpc/include/userret.h:1.24
--- src/sys/arch/powerpc/include/userret.h:1.23	Thu May 17 16:21:45 2012
+++ src/sys/arch/powerpc/include/userret.h	Sat May 26 00:31:07 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: userret.h,v 1.23 2012/05/17 16:21:45 matt Exp $	*/
+/*	$NetBSD: userret.h,v 1.24 2012/05/26 00:31:07 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -35,6 +35,7 @@
 #include opt_altivec.h
 
 #include sys/userret.h
+#include sys/ras.h
 
 #include powerpc/fpu.h
 #include powerpc/psl.h
@@ -83,4 +84,16 @@ userret(struct lwp *l, struct trapframe 
 		booke_sstep(tf);
 	}
 #endif
+
+#ifdef __HAVE_RAS
+	/*
+	 * Check to see if a RAS was interrupted and restart it if it was.  
+	 */
+	struct proc * const p = l-l_proc;
+	if (__predict_false(p-p_raslist != NULL)) {
+		void * const ras_pc = ras_lookup(p, (void *) tf-tf_srr0);
+		if (ras_pc != (void *) -1)
+			tf-tf_srr0 = (vaddr_t) ras_pc;
+	}
+#endif
 }

CVS commit: src/etc

2012-05-25 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Sat May 26 00:36:15 UTC 2012

Modified Files:
src/etc: MAKEDEV.tmpl

Log Message:
Create /dev/iscsi0 as part of 'all'.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/etc/MAKEDEV.tmpl

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

Modified files:

Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.154 src/etc/MAKEDEV.tmpl:1.155
--- src/etc/MAKEDEV.tmpl:1.154	Sat Apr  7 17:22:10 2012
+++ src/etc/MAKEDEV.tmpl	Sat May 26 00:36:15 2012
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV.tmpl,v 1.154 2012/04/07 17:22:10 christos Exp $
+#	$NetBSD: MAKEDEV.tmpl,v 1.155 2012/05/26 00:36:15 riz Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -812,6 +812,7 @@ all)
 	makedev md0 md1
 	makedev raid0 raid1 raid2 raid3 raid4 raid5 raid6 raid7
 	makedev vnd0 vnd1 vnd2 vnd3
+	makedev iscsi0
 	makedev bpf npf
 	makedev tun0 tun1 tun2 tun3
 	makedev ipl pf crypto random

CVS commit: src

2012-05-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Sat May 26 01:58:21 UTC 2012

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/usr.sbin: Makefile
Added Files:
src/usr.sbin/wakeonlan: Makefile wakeonlan.8 wakeonlan.c
Removed Files:
src/usr.sbin/wake: Makefile wake.8 wake.c

Log Message:
Rename wake(8) to wakeonlan(8).  Approved by core@.


To generate a diff of this commit:
cvs rdiff -u -r1.991 -r1.992 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1758 -r1.1759 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1390 -r1.1391 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.264 -r1.265 src/usr.sbin/Makefile
cvs rdiff -u -r1.2 -r0 src/usr.sbin/wake/Makefile
cvs rdiff -u -r1.8 -r0 src/usr.sbin/wake/wake.8
cvs rdiff -u -r1.13 -r0 src/usr.sbin/wake/wake.c
cvs rdiff -u -r0 -r1.1 src/usr.sbin/wakeonlan/Makefile \
src/usr.sbin/wakeonlan/wakeonlan.8 src/usr.sbin/wakeonlan/wakeonlan.c

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.991 src/distrib/sets/lists/base/mi:1.992
--- src/distrib/sets/lists/base/mi:1.991	Wed May  9 22:04:05 2012
+++ src/distrib/sets/lists/base/mi	Sat May 26 01:58:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.991 2012/05/09 22:04:05 christos Exp $
+# $NetBSD: mi,v 1.992 2012/05/26 01:58:17 uebayasi Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -1495,7 +1495,8 @@
 ./usr/sbin/veriexecgenbase-sysutil-bin
 ./usr/sbin/vipw	base-sysutil-bin
 ./usr/sbin/vnconfigbase-sysutil-bin
-./usr/sbin/wake	base-netutil-bin
+./usr/sbin/wake	base-obsolete
+./usr/sbin/wakeonlanbase-netutil-bin
 ./usr/sbin/wiconfigbase-sysutil-bin
 ./usr/sbin/wire-testbase-netutil-bin
 ./usr/sbin/wlanctlbase-sysutil-bin

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1758 src/distrib/sets/lists/comp/mi:1.1759
--- src/distrib/sets/lists/comp/mi:1.1758	Sun May 13 09:00:51 2012
+++ src/distrib/sets/lists/comp/mi	Sat May 26 01:58:18 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1758 2012/05/13 09:00:51 mrg Exp $
+#	$NetBSD: mi,v 1.1759 2012/05/26 01:58:18 uebayasi Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -4326,7 +4326,8 @@
 ./usr/libdata/debug/usr/sbin/veriexecgen.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/vipw.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/vnconfig.debug	comp-sysutil-debug	debug
-./usr/libdata/debug/usr/sbin/wake.debug		comp-netutil-debug	debug
+./usr/libdata/debug/usr/sbin/wake.debug		comp-obsolete		obsolete
+./usr/libdata/debug/usr/sbin/wakeonlan.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/sbin/wiconfig.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/wire-test.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/sbin/wlanctl.debug	comp-sysutil-debug	debug

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1390 src/distrib/sets/lists/man/mi:1.1391
--- src/distrib/sets/lists/man/mi:1.1390	Tue May 15 17:47:48 2012
+++ src/distrib/sets/lists/man/mi	Sat May 26 01:58:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1390 2012/05/15 17:47:48 rkujawa Exp $
+# $NetBSD: mi,v 1.1391 2012/05/26 01:58:20 uebayasi Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2950,7 +2950,8 @@
 ./usr/share/man/cat8/virtual.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat8/vmstat.0			man-obsolete		obsolete
 ./usr/share/man/cat8/vnconfig.0			man-sysutil-catman	.cat
-./usr/share/man/cat8/wake.0			man-netutil-catman	.cat
+./usr/share/man/cat8/wake.0			man-obsolete		obsolete
+./usr/share/man/cat8/wakeonlan.0		man-netutil-catman	.cat
 ./usr/share/man/cat8/walnut/MAKEDEV.0		man-obsolete		obsolete
 ./usr/share/man/cat8/walnut/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/wdogctl.0			man-sysutil-catman	.cat
@@ -5527,7 +5528,8 @@
 ./usr/share/man/html8/virecover.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/virtual.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html8/vnconfig.html		man-sysutil-htmlman	html
-./usr/share/man/html8/wake.html			man-netutil-htmlman	html
+./usr/share/man/html8/wake.html			man-obsolete		obsolete
+./usr/share/man/html8/wakeonlan.html		man-netutil-htmlman	html
 ./usr/share/man/html8/wdogctl.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/wiconfig.html		man-netutil-htmlman	html
 ./usr/share/man/html8/wire-test.html		man-netutil-htmlman	html
@@ -8475,7 +8477,8 @@
 ./usr/share/man/man8/virtual.8			man-postfix-man		postfix,.man
 ./usr/share/man/man8/vmstat.8			man-obsolete		obsolete
 ./usr/share/man/man8/vnconfig.8			man-sysutil-man		.man
-./usr/share/man/man8/wake.8			man-netutil-man		.man

CVS commit: src/distrib/utils/sysinst

2012-05-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sat May 26 05:09:59 UTC 2012

Modified Files:
src/distrib/utils/sysinst: mbr.c

Log Message:
Fix regression by my dumb patch in PR/45990.

sysinst fails with floating exception after
changing MBR partition size in MBR editor menu
if the target disk doesn't have valid MBR partition
or has a valid partition 0 whose offset is not 1MB aligned
(like 63 sectors).

read_mbr() (which calls get_ptn_alignment()) is called
before set_bios_geom(), so bhead is not initialized there
and ptn_alignment could be zero.

To workaround, explicitly call get_ptn_alignment() again
in edit_mbr() to update ptn_alignemnt per BIOS geom values.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/distrib/utils/sysinst/mbr.c

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

Modified files:

Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.90 src/distrib/utils/sysinst/mbr.c:1.91
--- src/distrib/utils/sysinst/mbr.c:1.90	Sat Apr  7 03:08:33 2012
+++ src/distrib/utils/sysinst/mbr.c	Sat May 26 05:09:59 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbr.c,v 1.90 2012/04/07 03:08:33 tsutsui Exp $ */
+/*	$NetBSD: mbr.c,v 1.91 2012/05/26 05:09:59 tsutsui Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1271,6 +1271,7 @@ edit_mbr(mbr_info_t *mbri)
 	/* Ask full/part */
 
 	part = mbrs-mbr_parts[0];
+	get_ptn_alignment(part);	/* update ptn_alignment */
 	msg_display(MSG_fullpart, diskdev);
 	process_menu(MENU_fullpart, usefull);
 
@@ -1477,7 +1478,7 @@ read_mbr(const char *disk, mbr_info_t *m
 
 		mbrp = mbrs-mbr_parts[0];
 		if (ext_base == 0) {
-			get_ptn_alignment(mbrp);
+			get_ptn_alignment(mbrp);	/* get ptn_0_offset */
 		} else {
 			/* sanity check extended chain */
 			if (MBR_IS_EXTENDED(mbrp[0].mbrp_type))

CVS commit: src/distrib/notes/common

2012-05-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sat May 26 05:51:13 UTC 2012

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

Log Message:
Most contents in ftp://ftp.NetBSD.org/pub/NetBSD/packages/ seem removed
recently (do we have any announcment?) so update pakcages URLs and
descriptions accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/distrib/notes/common/postinstall

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/postinstall
diff -u src/distrib/notes/common/postinstall:1.74 src/distrib/notes/common/postinstall:1.75
--- src/distrib/notes/common/postinstall:1.74	Sat Apr 25 21:21:48 2009
+++ src/distrib/notes/common/postinstall	Sat May 26 05:51:13 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: postinstall,v 1.74 2009/04/25 21:21:48 snj Exp $
+.\	$NetBSD: postinstall,v 1.75 2012/05/26 05:51:13 tsutsui Exp $
 .\
 .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -339,7 +339,7 @@ More information on the package system i
 .Lk http://www.NetBSD.org/docs/software/packages.html
 .It
 A list of available packages suitable for browsing is at
-.Lk ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/README.html
+.Lk ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/README.html
 .It
 Precompiled binaries can be found at
 .Lk ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/
@@ -372,9 +372,6 @@ then replace the first two lines with th
 Some mirror sites don't mirror the
 .Pa /pub/pkgsrc
 directory.
-If you would like to use such mirrors, you could also try the
-.Pa /pub/NetBSD/packages/current-packages/NetBSD/\*M/\*V/All
-directory, which may have the same contents.
 .Note)
 .Pp
 The above commands will install the Tenex-csh and Bourne Again shells,
@@ -397,7 +394,7 @@ for more information about NetBSD's rele
 .It
 The framework for compiling packages can be obtained by
 retrieving the file
-.Lk ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc.tar.gz
+.Lk ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc.tar.gz .
 It is typically extracted into
 .Pa /usr/pkgsrc
 (though other locations work fine) with the commands:

CVS commit: src/share/mk

2012-05-25 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Fri May 25 10:48:48 UTC 2012

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

Log Message:
Document MKREPRO here as well.


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/share/mk/bsd.README

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

CVS commit: src/sys/dev

2012-05-25 Thread Roland Dowdeswell 
Module Name:src
Committed By:   elric
Date:   Fri May 25 10:53:46 UTC 2012

Modified Files:
src/sys/dev: cgd.c cgdvar.h dksubr.c dkvar.h

Log Message:
Modify dksubr.c to add a function that sets the disk properties in
the drvctl framework.  And call this new functionality from cgd(4),
the consumer of dksubr.c.  We do this to allow gpt(8) to be able
to label cgd(4) disks.  We also add in some DIOCGSECTORSIZE logic
and we ensure that the WEDGE ioctls are not called on either
uninitialised disks or disks which have not been opened for write
access.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/cgd.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cgdvar.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/dksubr.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dkvar.h

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

CVS commit: src

2012-05-25 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Fri May 25 13:47:30 UTC 2012

Modified Files:
src: BUILDING

Log Message:
regen using 'make regen' in doc/


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/BUILDING

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

CVS commit: src/sys/dev

2012-05-25 Thread Roland Dowdeswell 
Module Name:src
Committed By:   elric
Date:   Fri May 25 14:25:39 UTC 2012

Modified Files:
src/sys/dev: dksubr.c

Log Message:
Revert a few lines of accidental commit.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/dksubr.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/xen/xen

2012-05-25 Thread Roland Dowdeswell 
Module Name:src
Committed By:   elric
Date:   Fri May 25 15:03:38 UTC 2012

Modified Files:
src/sys/arch/xen/xen: xbd_xenbus.c

Log Message:
Update xdb_xenbus.c to new usage of routines in dksubr.c.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/xen/xen/xbd_xenbus.c

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

CVS commit: src/share/man/man4

2012-05-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri May 25 15:54:03 UTC 2012

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

Log Message:
Add dumb description about options NFS_BOOT_BOOTSTATIC.  Noticed by ryo@.


To generate a diff of this commit:
cvs rdiff -u -r1.415 -r1.416 src/share/man/man4/options.4

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

CVS commit: src/sys/dev/usb

2012-05-25 Thread Brian Buhrow 
Module Name:src
Committed By:   buhrow
Date:   Fri May 25 16:29:37 UTC 2012

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

Log Message:
Regen after successful build release
(Includes Apple iPod Touch (4th generation)
and
Springer Design's TTSMP3 players


To generate a diff of this commit:
cvs rdiff -u -r1.607 -r1.608 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.608 -r1.609 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.

CVS commit: src/sys/dev/usb

2012-05-25 Thread Brian Buhrow 
Module Name:src
Committed By:   buhrow
Date:   Fri May 25 16:33:54 UTC 2012

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

Log Message:
Added the Apple iPod Touch (4th generation)
to the list of Apple devices with bogus uhid and uaudio matches.
It now attaches as a ugen device.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 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.

CVS commit: src/sys/dev/pci

2012-05-25 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Fri May 25 18:18:32 UTC 2012

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add some Intel I350 Ethernet products.


To generate a diff of this commit:
cvs rdiff -u -r1.1116 -r1.1117 src/sys/dev/pci/pcidevs

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

CVS commit: src/sys/dev/pci

2012-05-25 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Fri May 25 18:19:43 UTC 2012

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen for Intel I350 (wm)


To generate a diff of this commit:
cvs rdiff -u -r1.1110 -r1. src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1109 -r1.1110 src/sys/dev/pci/pcidevs_data.h

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

CVS commit: src

2012-05-25 Thread John Nemeth 
Module Name:src
Committed By:   jnemeth
Date:   Fri May 25 21:46:13 UTC 2012

Modified Files:
src/distrib/sets/lists/base: rescue.mi
src/rescue: list

Log Message:
PR/46393 - Nat Sloss -- add gpt(8) to /rescue


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.42 -r1.43 src/rescue/list

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

CVS commit: src

2012-05-25 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Fri May 25 23:37:38 UTC 2012

Modified Files:
src/share/man/man4: wm.4
src/sys/dev/pci: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
Add support Intel I350 Ethernet.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/share/man/man4/wm.4
cvs rdiff -u -r1.227 -r1.228 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_wmvar.h

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

CVS commit: src/etc

2012-05-25 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Sat May 26 00:36:15 UTC 2012

Modified Files:
src/etc: MAKEDEV.tmpl

Log Message:
Create /dev/iscsi0 as part of 'all'.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/etc/MAKEDEV.tmpl

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

CVS commit: src

2012-05-25 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Sat May 26 01:58:21 UTC 2012

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/usr.sbin: Makefile
Added Files:
src/usr.sbin/wakeonlan: Makefile wakeonlan.8 wakeonlan.c
Removed Files:
src/usr.sbin/wake: Makefile wake.8 wake.c

Log Message:
Rename wake(8) to wakeonlan(8).  Approved by core@.


To generate a diff of this commit:
cvs rdiff -u -r1.991 -r1.992 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1758 -r1.1759 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1390 -r1.1391 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.264 -r1.265 src/usr.sbin/Makefile
cvs rdiff -u -r1.2 -r0 src/usr.sbin/wake/Makefile
cvs rdiff -u -r1.8 -r0 src/usr.sbin/wake/wake.8
cvs rdiff -u -r1.13 -r0 src/usr.sbin/wake/wake.c
cvs rdiff -u -r0 -r1.1 src/usr.sbin/wakeonlan/Makefile \
src/usr.sbin/wakeonlan/wakeonlan.8 src/usr.sbin/wakeonlan/wakeonlan.c

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

CVS commit: src/distrib/utils/sysinst

2012-05-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sat May 26 05:09:59 UTC 2012

Modified Files:
src/distrib/utils/sysinst: mbr.c

Log Message:
Fix regression by my dumb patch in PR/45990.

sysinst fails with floating exception after
changing MBR partition size in MBR editor menu
if the target disk doesn't have valid MBR partition
or has a valid partition 0 whose offset is not 1MB aligned
(like 63 sectors).

read_mbr() (which calls get_ptn_alignment()) is called
before set_bios_geom(), so bhead is not initialized there
and ptn_alignment could be zero.

To workaround, explicitly call get_ptn_alignment() again
in edit_mbr() to update ptn_alignemnt per BIOS geom values.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/distrib/utils/sysinst/mbr.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

2012-05-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sat May 26 05:51:13 UTC 2012

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

Log Message:
Most contents in ftp://ftp.NetBSD.org/pub/NetBSD/packages/ seem removed
recently (do we have any announcment?) so update pakcages URLs and
descriptions accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/distrib/notes/common/postinstall

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