 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.186 2012/05/28 19:24:30 martin Exp $ */
+/*	$NetBSD: autoconf.c,v 1.187 2012/06/10 17:05:18 mlelstv Exp $ */
 /*
  * Copyright (c) 1996
  *    The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -38,27 +38,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)autoconf.c	8.4 (Berkeley) 10/1/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.186 2012/05/28 19:24:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.187 2012/06/10 17:05:18 mlelstv Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 @@ -498,30 +498,27 @@ cpu_configure(void)
 	(void)spl0();
+}
 void
 cpu_rootconf(void)
+{
 	if (booted_device == NULL) {
 		printf("FATAL: boot device not found, check your firmware "
 		    "settings!\n");
 		setroot(NULL, 0);
 		return;
+	}
-	if (config_handle_wedges(booted_device, booted_partition) == 0)
+	setroot(booted_device, booted_partition);
 		setroot(booted_wedge, 0);
 	else
 		setroot(booted_device, booted_partition);
+}
 char *
 clockfreq(long freq)
+{
 	char *p;
 	static char sbuf[10];
 	freq /= 1000;
 	sprintf(sbuf, "%ld", freq / 1000);
 	freq %= 1000;
 	if (freq) {
 		freq += 1000;	/* now in 1000..1999 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_autoconf.c,v 1.62 2011/10/18 23:43:36 dyoung Exp $	*/
+/*	$NetBSD: x86_autoconf.c,v 1.63 2012/06/10 17:05:18 mlelstv Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.62 2011/10/18 23:43:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.63 2012/06/10 17:05:18 mlelstv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
 #include <sys/md5.h>
 #include <sys/kauth.h>
 @@ -54,35 +54,26 @@ __KERNEL_RCSID(0, "$NetBSD: x86_autoconf
 #include <machine/bootinfo.h>
 #include <machine/pio.h>
 #include "acpica.h"
 #include "wsdisplay.h"
 #if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #endif
 struct disklist *x86_alldisks;
 int x86_ndisks;
 static void
 handle_wedges(device_t dv, int par)
 	if (config_handle_wedges(dv, par) == 0)
 		return;
 	booted_device = dv;
 	booted_partition = par;
 static int
 is_valid_disk(device_t dv)
+{
 	if (device_class(dv) != DV_DISK)
 		return (0);
 	return (device_is_a(dv, "dk") ||
 		device_is_a(dv, "sd") ||
 		device_is_a(dv, "wd") ||
 		device_is_a(dv, "ld") ||
 		device_is_a(dv, "ed"));
+}
 @@ -334,27 +325,29 @@ findroot(void)
 		     dv != NULL;
 		     dv = deviter_next(&di)) {
 			cfdata_t cd;
 			size_t len;
 			if (device_class(dv) != DV_DISK)
 				continue;
 			cd = device_cfdata(dv);
 			len = strlen(cd->cf_name);
 			if (strncmp(cd->cf_name, biv->devname, len) == 0 &&
 			    biv->devname[len] - '0' == device_unit(dv)) {
-				handle_wedges(dv, biv->devname[len + 1] - 'a');
+				booted_device = dv;
 				booted_partition = biv->devname[len + 1] - 'a';
 				booted_nblks = 0;
 				break;
+			}
+		}
 		deviter_release(&di);
 		if (dv != NULL)
 			return;
+	}
 	if ((biw = lookup_bootinfo(BTINFO_BOOTWEDGE)) != NULL) {
 		/*
 		 * Scan all disk devices for ones that match the passed data.
 		 * Don't break if one is found, to get possible multiple
 		 * matches - for problem tracking.  Use the first match anyway
 @@ -378,31 +371,34 @@ findroot(void)
 				    	continue;
 				goto bootwedge_found;
+			}
 			continue;
  bootwedge_found:
 			if (booted_device) {
 				printf("WARNING: double match for boot "
 				    "device (%s, %s)\n",
 				    device_xname(booted_device),
 				    device_xname(dv));
 				continue;
+			}
-			dkwedge_set_bootwedge(dv, biw->startblk, biw->nblks);
+			booted_device = dv;
 			booted_partition = 0;
 			booted_nblks = biw->nblks;
 			booted_startblk = biw->startblk;
+		}
 		deviter_release(&di);
-		if (booted_wedge)
+		if (booted_nblks)
 			return;
+	}
 	if ((bid = lookup_bootinfo(BTINFO_BOOTDISK)) != NULL) {
 		/*
 		 * Scan all disk devices for ones that match the passed data.
 		 * Don't break if one is found, to get possible multiple
 		 * matches - for problem tracking.  Use the first match anyway
 		 * because lower device numbers are more likely to be the
 		 * boot device.
 		 */
 		for (dv = deviter_first(&di, DEVITER_F_ROOT_FIRST);
 		     dv != NULL;
 @@ -435,27 +431,29 @@ findroot(void)
 				    	continue;
 				goto bootdisk_found;
+			}
 			continue;
  bootdisk_found:
 			if (booted_device) {
 				printf("WARNING: double match for boot "
 				    "device (%s, %s)\n",
 				    device_xname(booted_device),
 				    device_xname(dv));
 				continue;
+			}
-			handle_wedges(dv, bid->partition);
+			booted_device = dv;
 			booted_partition = bid->partition;
 			booted_nblks = 0;
+		}
 		deviter_release(&di);
 		if (booted_device)
 			return;
 		/*
 		 * No booted device found; check CD-ROM boot at last.
+		 *
 		 * Our bootloader assumes CD-ROM boot if biosdev is larger
 		 * than the number of hard drives recognized by the BIOS.
 		 * The number of drives can be found in BTINFO_BIOSGEOM here.
+		 *
 @@ -467,51 +465,45 @@ findroot(void)
 			/*
 			 * XXX
 			 * There is no proper way to detect which unit is
 			 * recognized as a bootable CD-ROM drive by the BIOS.
 			 * Assume the first unit is the one.
 			 */
 			for (dv = deviter_first(&di, DEVITER_F_ROOT_FIRST);
 			     dv != NULL;
 			     dv = deviter_next(&di)) {
 				if (device_class(dv) == DV_DISK &&
 				    device_is_a(dv, "cd")) {
 					booted_device = dv;
 					booted_partition = 0;
 					booted_nblks = 0;
 					break;
+				}
+			}
 			deviter_release(&di);
+		}
+	}
+}
 void
 cpu_rootconf(void)
+{
 	findroot();
 	matchbiosdisks();
-	if (booted_wedge) {
+	aprint_normal("boot device: %s\n",
-		KASSERT(booted_device != NULL);
+	    booted_device ? device_xname(booted_device) : "<unknown>");
-		aprint_normal("boot device: %s (%s)\n",
+	setroot(booted_device, booted_partition);
 		    device_xname(booted_wedge), device_xname(booted_device));
 		setroot(booted_wedge, 0);
 	} else {
 		aprint_normal("boot device: %s\n",
 		    booted_device ? device_xname(booted_device) : "<unknown>");
 		setroot(booted_device, booted_partition);
+}
 void
 device_register(device_t dev, void *aux)
+{
 	device_t isaboot, pciboot;
 	isaboot = device_isa_register(dev, aux);
 	pciboot = device_pci_register(dev, aux);
 	if (isaboot == NULL && pciboot == NULL)
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.13 2009/11/27 03:23:15 rmind Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.14 2012/06/10 17:05:19 mlelstv Exp $	*/
 /*	NetBSD: autoconf.c,v 1.75 2003/12/30 12:33:22 pk Exp 	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -35,27 +35,27 @@
  *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
  */
 /*
  * Setup the system to run on the current machine.
+ *
  * Configure() is called at boot time and initializes the vba
  * device tables and the memory controller monitoring.  Available
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2009/11/27 03:23:15 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2012/06/10 17:05:19 mlelstv Exp $");
 #include "opt_xen.h"
 #include "opt_compat_oldboot.h"
 #include "opt_multiprocessor.h"
 #include "opt_nfs_boot.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/conf.h>
 #ifdef COMPAT_OLDBOOT
 @@ -78,27 +78,26 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
 #include <nfs/nfsmount.h>
 #include <nfs/nfsdiskless.h>
 #include <xen/if_xennetvar.h>
 #endif
 #include <machine/pte.h>
 #include <machine/cpu.h>
 #include <machine/gdt.h>
 #include <machine/pcb.h>
 #include <machine/bootinfo.h>
 static void findroot(void);
 static int is_valid_disk(device_t);
 static void handle_wedges(device_t, int);
 struct disklist *x86_alldisks;
 int x86_ndisks;
 #include "bios32.h"
 #if NBIOS32 > 0
 #include <machine/bios32.h>
 #endif
 #include "opt_pcibios.h"
 #ifdef PCIBIOS
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -145,36 +144,29 @@ cpu_configure(void)
 #ifdef MULTIPROCESSOR
 	/* propagate this to the idle pcb's. */
 	cpu_init_idle_lwps();
 #endif
 	spl0();
+}
 void
 cpu_rootconf(void)
+{
 	findroot();
-	if (booted_wedge) {
+	printf("boot device: %s\n",
-		KASSERT(booted_device != NULL);
+	    booted_device ? device_xname(booted_device) : "<unknown>");
-		printf("boot device: %s (%s)\n",
+	setroot(booted_device, booted_partition);
 		    device_xname(booted_wedge), device_xname(booted_device));
 		setroot(booted_wedge, 0);
 	} else {
 		printf("boot device: %s\n",
 		    booted_device ? device_xname(booted_device) : "<unknown>");
 		setroot(booted_device, booted_partition);
+}
 /*
  * Attempt to find the device from which we were booted.
  * If we can do so, and not instructed not to do so,
  * change rootdev to correspond to the load device.
  */
 void
 findroot(void)
+{
 	device_t dv;
 	deviter_t di;
 @@ -189,27 +181,27 @@ findroot(void)
 	     dv != NULL;
 	     dv = deviter_next(&di)) {
 		bool is_ifnet, is_disk;
 		const char *devname;
 		is_ifnet = (device_class(dv) == DV_IFNET);
 		is_disk = is_valid_disk(dv);
 		devname = device_xname(dv);
 		if (!is_ifnet && !is_disk)
 			continue;
 		if (is_disk && xcp.xcp_bootdev[0] == 0) {
-			handle_wedges(dv, 0);
+			booted_device = dv;
 			break;
+		}
 		if (strncmp(xcp.xcp_bootdev, devname, strlen(devname)))
 			continue;
 		if (is_disk && strlen(xcp.xcp_bootdev) > strlen(devname)) {
 			booted_partition = toupper(
 				xcp.xcp_bootdev[strlen(devname)]) - 'A';
+		}
 		booted_device = dv;
 		break;
 @@ -344,35 +336,26 @@ device_register(device_t dev, void *aux)
+	}
 	return;
 found:
 	if (booted_device) {
 		/* XXX should be a "panic()" */
 		printf("warning: double match for boot device (%s, %s)\n",
 		    device_xname(booted_device), device_xname(dev));
 		return;
+	}
 	booted_device = dev;
+}
 static void
 handle_wedges(device_t dv, int par)
 	if (config_handle_wedges(dv, par) == 0)
 		return;
 	booted_device = dv;
 	booted_partition = par;
 static int
 is_valid_disk(device_t dv)
+{
 	if (device_class(dv) != DV_DISK)
 		return (0);
 	return (device_is_a(dv, "dk") ||
 		device_is_a(dv, "sd") ||
 		device_is_a(dv, "wd") ||
 		device_is_a(dv, "ld") ||
 		device_is_a(dv, "ed") ||
 		device_is_a(dv, "xbd"));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dk.c,v 1.63 2012/04/27 18:15:55 drochner Exp $	*/
+/*	$NetBSD: dk.c,v 1.64 2012/06/10 17:05:19 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.63 2012/04/27 18:15:55 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.64 2012/06/10 17:05:19 mlelstv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 @@ -738,64 +738,26 @@ dkwedge_print_wnames(void)
 	struct dkwedge_softc *sc;
 	int i;
 	rw_enter(&dkwedges_lock, RW_WRITER);
 	for (i = 0; i < ndkwedges; i++) {
 		if ((sc = dkwedges[i]) == NULL)
 			continue;
 		printf(" wedge:%s", sc->sc_wname);
+	}
 	rw_exit(&dkwedges_lock);
+}
 /*
  * dkwedge_set_bootwedge
  *	Set the booted_wedge global based on the specified parent name
  *	and offset/length.
  */
 void
 dkwedge_set_bootwedge(device_t parent, daddr_t startblk, uint64_t nblks)
 	struct dkwedge_softc *sc;
 	int i;
 	rw_enter(&dkwedges_lock, RW_WRITER);
 	for (i = 0; i < ndkwedges; i++) {
 		if ((sc = dkwedges[i]) == NULL)
 			continue;
 		if (strcmp(sc->sc_parent->dk_name, device_xname(parent)) == 0 &&
 		    sc->sc_offset == startblk &&
 		    sc->sc_size == nblks) {
 			if (booted_wedge) {
 				printf("WARNING: double match for boot wedge "
 				    "(%s, %s)\n",
 				    device_xname(booted_wedge),
 				    device_xname(sc->sc_dev));
 				continue;
 			booted_device = parent;
 			booted_wedge = sc->sc_dev;
 			booted_partition = 0;
 	/*
 	 * XXX What if we don't find one?  Should we create a special
 	 * XXX root wedge?
 	 */
 	rw_exit(&dkwedges_lock);
 /*
  * We need a dummy object to stuff into the dkwedge discovery method link
  * set to ensure that there is always at least one object in the set.
  */
 static struct dkwedge_discovery_method dummy_discovery_method;
 __link_set_add_bss(dkwedge_methods, dummy_discovery_method);
 /*
  * dkwedge_init:
+ *
  *	Initialize the disk wedge subsystem.
  */
 void
 dkwedge_init(void)
 @@ -1456,75 +1418,48 @@ dkdump(dev_t dev, daddr_t blkno, void *v
 	rv = (*bdev->d_dump)(sc->sc_pdev, blkno + sc->sc_offset, va, size);
 out:
 	mutex_exit(&sc->sc_parent->dk_rawlock);
 	mutex_exit(&sc->sc_dk.dk_openlock);
 	return rv;
+}
 /*
  * config glue
  */
-int
+/*
-config_handle_wedges(struct device *dv, int par)
+ * dkwedge_find_partition
+ *
  *	Find wedge corresponding to the specified parent name
  *	and offset/length.
  */
 device_t
 dkwedge_find_partition(device_t parent, daddr_t startblk, uint64_t nblks)
+{
-	struct dkwedge_list wl;
+	struct dkwedge_softc *sc;
-	struct dkwedge_info *wi;
+	int i;
-	struct vnode *vn;
+	device_t wedge = NULL;
 	char diskname[16];
 	int i, error;
 	if ((vn = opendisk(dv)) == NULL)
 		return -1;
 	wl.dkwl_bufsize = sizeof(*wi) * 16;
 	wl.dkwl_buf = wi = malloc(wl.dkwl_bufsize, M_TEMP, M_WAITOK);
 	error = VOP_IOCTL(vn, DIOCLWEDGES, &wl, FREAD, NOCRED);
 	VOP_CLOSE(vn, FREAD, NOCRED);
 	vput(vn);
 	if (error) {
 #ifdef DEBUG_WEDGE
 		printf("%s: List wedges returned %d\n",
 		    device_xname(dv), error);
 #endif
 		free(wi, M_TEMP);
 		return -1;
 #ifdef DEBUG_WEDGE
 	printf("%s: Returned %u(%u) wedges\n", device_xname(dv),
 	    wl.dkwl_nwedges, wl.dkwl_ncopied);
 #endif
 	snprintf(diskname, sizeof(diskname), "%s%c", device_xname(dv),
 	    par + 'a');
 	for (i = 0; i < wl.dkwl_ncopied; i++) {
 #ifdef DEBUG_WEDGE
 		printf("%s: Looking for %s in %s\n",
 		    device_xname(dv), diskname, wi[i].dkw_wname);
 #endif
 		if (strcmp(wi[i].dkw_wname, diskname) == 0)
 			break;
-	if (i == wl.dkwl_ncopied) {
+	rw_enter(&dkwedges_lock, RW_READER);
-#ifdef DEBUG_WEDGE
+	for (i = 0; i < ndkwedges; i++) {
-		printf("%s: Cannot find wedge with parent %s\n",
+		if ((sc = dkwedges[i]) == NULL)
-		    device_xname(dv), diskname);
+			continue;
-#endif
+		if (strcmp(sc->sc_parent->dk_name, device_xname(parent)) == 0 &&
-		free(wi, M_TEMP);
+		    sc->sc_offset == startblk &&
-		return -1;
+		    sc->sc_size == nblks) {
 			if (wedge) {
 				printf("WARNING: double match for boot wedge "
 				    "(%s, %s)\n",
 				    device_xname(wedge),
 				    device_xname(sc->sc_dev));
 				continue;
+			}
 			wedge = sc->sc_dev;
+		}
+	}
 	rw_exit(&dkwedges_lock);
-#ifdef DEBUG_WEDGE
+	return wedge;
 	printf("%s: Setting boot wedge %s (%s) at %llu %llu\n",
 		device_xname(dv), wi[i].dkw_devname, wi[i].dkw_wname,
 		(unsigned long long)wi[i].dkw_offset,
 		(unsigned long long)wi[i].dkw_size);
 #endif
 	dkwedge_set_bootwedge(dv, wi[i].dkw_offset, wi[i].dkw_size);
 	free(wi, M_TEMP);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_main.c,v 1.442 2012/02/19 21:06:47 rmind Exp $	*/
+/*	$NetBSD: init_main.c,v 1.443 2012/06/10 17:05:18 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -87,27 +87,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)init_main.c	8.16 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.442 2012/02/19 21:06:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.443 2012/06/10 17:05:18 mlelstv Exp $");
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
 #include "opt_modular.h"
 #include "opt_ntp.h"
 #include "opt_pipe.h"
 #include "opt_syscall_debug.h"
 #include "opt_sysv.h"
 #include "opt_fileassoc.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #include "opt_compat_netbsd.h"
 #include "opt_wapbl.h"
 @@ -249,26 +249,27 @@ extern time_t rootfstime;
 struct	lwp *curlwp = &lwp0;
 #endif
 struct	proc *initproc;
 struct	vnode *rootvp, *swapdev_vp;
 int	boothowto;
 int	cold = 1;			/* still working on startup */
 struct timespec boottime;	        /* time at system startup - will only follow settime deltas */
 int	start_init_exec;		/* semaphore for start_init() */
 cprng_strong_t	*kern_cprng;
 static void rootconf(void);
 static void check_console(struct lwp *l);
 static void start_init(void *);
 static void configure(void);
 static void configure2(void);
 static void configure3(void);
 void main(void);
 /*
  * System startup; initialize the world, create process 0, mount root
  * filesystem, and fork to create init and pagedaemon.  Most of the
  * hard work is done in the lower-level initialization routines including
  * startup(), which does memory initialization and autoconfiguration.
  */
 @@ -623,27 +624,27 @@ main(void)
 	/*
 	 * Finalize configuration now that all real devices have been
 	 * found.  This needs to be done before the root device is
 	 * selected, since finalization may create the root device.
 	 */
 	config_finalize();
 	sysctl_finalize();
 	/*
 	 * Now that autoconfiguration has completed, we can determine
 	 * the root and dump devices.
 	 */
-	cpu_rootconf();
+	rootconf();
 	cpu_dumpconf();
 	/* Mount the root file system. */
 	do {
 		domountroothook(root_device);
 		if ((error = vfs_mountroot())) {
 			printf("cannot mount root, error = %d\n", error);
 			boothowto |= RB_ASKNAME;
 			setroot(root_device,
 			    (rootdev != NODEV) ? DISKPART(rootdev) : 0);
+		}
 	} while (error != 0);
 	mountroothook_destroy();
 @@ -810,26 +811,94 @@ configure3(void)
+{
 	/*
 	 * Create threads to call back and finish configuration for
 	 * devices that want the mounted root file system.
 	 */
 	config_create_mountrootthreads();
 	/* Get the threads going and into any sleeps before continuing. */
 	yield();
+}
 static void
 rootconf_handle_wedges(void)
+{
 	struct partinfo dpart;
 	struct partition *p;
 	struct vnode *vp;
 	daddr_t startblk;
 	uint64_t nblks;
 	device_t dev;
 	int error;
 	if (booted_nblks) {
 		/*
 		 * bootloader passed geometry
 		 */
 		dev      = booted_device;
 		startblk = booted_startblk;
 		nblks    = booted_nblks;
 		/*
 		 * keep booted_device and booted_partition
 		 * in case the kernel doesn't identify a wedge
 		 */
 	} else {
 		/*
 		 * bootloader passed partition number
+		 *
 		 * We cannot ask the partition device directly when it is
 		 * covered by a wedge. Instead we look up the geometry in
 		 * the disklabel.
 		 */
 		vp = opendisk(booted_device);
 		error = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, NOCRED);
 		VOP_CLOSE(vp, FREAD, NOCRED);
 		vput(vp);
 		if (error)
 			return;
 		KASSERT(booted_partition >= 0
 			&& booted_partition < MAXPARTITIONS);
 		p = &dpart.disklab->d_partitions[booted_partition];
 		dev      = booted_device;
 		startblk = p->p_offset;
 		nblks    = p->p_size;
+	}
 	dev = dkwedge_find_partition(dev, startblk, nblks);
 	if (dev != NULL) {
 		booted_device = dev;
 		booted_partition = 0;
+	}
+}
 static void
 rootconf(void)
+{
 	cpu_rootconf();
 	if (booted_device == NULL)
 		return;
 	rootconf_handle_wedges();
 	setroot(booted_device, booted_partition);
+}
 static void
 check_console(struct lwp *l)
+{
 	struct vnode *vp;
 	int error;
 	error = namei_simple_kernel("/dev/console",
 				NSM_FOLLOW_NOEMULROOT, &vp);
 	if (error == 0)
 		vrele(vp);
 	else if (error == ENOENT)
 		printf("warning: no /dev/console\n");
 	else
 		printf("warning: lookup /dev/console: error %d\n", error);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_subr.c,v 1.212 2011/09/19 23:54:29 christos Exp $	*/
+/*	$NetBSD: kern_subr.c,v 1.213 2012/06/10 17:05:18 mlelstv Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Luke Mewburn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -69,27 +69,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_subr.c	8.4 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.212 2011/09/19 23:54:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.213 2012/06/10 17:05:18 mlelstv Exp $");
 #include "opt_ddb.h"
 #include "opt_md.h"
 #include "opt_syscall_debug.h"
 #include "opt_ktrace.h"
 #include "opt_ptrace.h"
 #include "opt_tftproot.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/device.h>
 @@ -148,32 +148,32 @@ isswap(device_t dv)
+}
 /*
  * Determine the root device and, if instructed to, the root file system.
  */
 #ifdef MEMORY_DISK_IS_ROOT
 int md_is_root = 1;
 #else
 int md_is_root = 0;
 #endif
 /*
- * The device and wedge that we booted from.  If booted_wedge is NULL,
+ * The device and partition that we booted from.
  * the we might consult booted_partition.
  */
 device_t booted_device;
 device_t booted_wedge;
 int booted_partition;
 daddr_t booted_startblk;
 uint64_t booted_nblks;
 /*
  * Use partition letters if it's a disk class but not a wedge.
  * XXX Check for wedge is kinda gross.
  */
 #define	DEV_USES_PARTITIONS(dv)						\
 	(device_class((dv)) == DV_DISK &&				\
 	 !device_is_a((dv), "dk"))
 void
 setroot(device_t bootdv, int bootpartition)
+{
 	device_t dv;

 @@ -1,14 +1,14 @@
-/* $NetBSD: device.h,v 1.140 2011/11/13 22:05:58 christos Exp $ */
+/* $NetBSD: device.h,v 1.141 2012/06/10 17:05:18 mlelstv Exp $ */
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -413,34 +413,34 @@ typedef int (*cfprint_t)(void *, const c
 struct pdevinit {
 	void	(*pdev_attach)(int);
 	int	pdev_count;
 };
 /* This allows us to wildcard a device unit. */
 #define	DVUNIT_ANY	-1
 #ifdef _KERNEL
 extern struct cfdriverlist allcfdrivers;/* list of all cfdrivers */
 extern struct cftablelist allcftables;	/* list of all cfdata tables */
 extern device_t booted_device;		/* the device we booted from */
-extern device_t booted_wedge;		/* the wedge on that device */
+extern int booted_partition;		/* the partition on that device */
-extern int booted_partition;		/* or the partition on that device */
+extern daddr_t booted_startblk;		/* or the start of a wedge */
 extern uint64_t booted_nblks;		/* and the size of that wedge */
 struct vnode *opendisk(struct device *);
 int getdisksize(struct vnode *, uint64_t *, unsigned *);
 struct dkwedge_info;
 int getdiskinfo(struct vnode *, struct dkwedge_info *);
 int config_handle_wedges(struct device *, int);
 void	config_init(void);
 int	config_init_component(struct cfdriver *const*,
 			      const struct cfattachinit *, struct cfdata *);
 int	config_fini_component(struct cfdriver *const*,
 			      const struct cfattachinit *, struct cfdata *);
 void	config_init_mi(void);
 void	drvctl_init(void);
 int	config_cfdriver_attach(struct cfdriver *);
 int	config_cfdriver_detach(struct cfdriver *);
 int	config_cfattach_attach(const char *, struct cfattach *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: disk.h,v 1.56 2012/01/16 18:47:58 christos Exp $	*/
+/*	$NetBSD: disk.h,v 1.57 2012/06/10 17:05:18 mlelstv Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -520,20 +520,20 @@ void	disk_destroy(struct disk *);
 void	disk_busy(struct disk *);
 void	disk_unbusy(struct disk *, long, int);
 bool	disk_isbusy(struct disk *);
 void	disk_blocksize(struct disk *, int);
 struct disk *disk_find(const char *);
 int	disk_ioctl(struct disk *, u_long, void *, int, struct lwp *);
 void	dkwedge_init(void);
 int	dkwedge_add(struct dkwedge_info *);
 int	dkwedge_del(struct dkwedge_info *);
 void	dkwedge_delall(struct disk *);
 int	dkwedge_list(struct disk *, struct dkwedge_list *, struct lwp *);
 void	dkwedge_discover(struct disk *);
 void	dkwedge_set_bootwedge(device_t, daddr_t, uint64_t);
 int	dkwedge_read(struct disk *, struct vnode *, daddr_t, void *, size_t);
 device_t dkwedge_find_by_wname(const char *);
 void	dkwedge_print_wnames(void);
 device_t dkwedge_find_partition(device_t, daddr_t, uint64_t);
 #endif
 #endif /* _SYS_DISK_H_ */