 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.18 2014/11/22 11:10:22 mlelstv Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.19 2016/03/05 07:33:58 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas <matt@3am-software.com>.
+ *
  * 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,38 +20,38 @@
  * ``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: autoconf.c,v 1.18 2014/11/22 11:10:22 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2016/03/05 07:33:58 mlelstv Exp $");
 #include "opt_md.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 #include <machine/bootconfig.h>
 void	(*evbarm_device_register)(device_t, void *);
 void	(*evbarm_device_register_post_config)(device_t, void *);
 #ifndef MEMORY_DISK_IS_ROOT
 static int get_device(char *name, device_t *, int *);
 static void set_root_device(void);
 #endif
 @@ -85,49 +85,67 @@ get_device(char *name, device_t *dvp, in
 	else if (*cp != '\0' && *cp != ' ')
 		return 0;
 	if ((dv = device_find_by_driver_unit(devname, unit)) != NULL) {
 		*dvp = dv;
 		*partp = part;
 		return 1;
+	}
 	return 0;
+}
 /* Set the rootdev variable from the root specifier in the boot args */
 static char *bootspec_buf = NULL;
 static size_t bootspec_buflen = 0;
 static void
 set_root_device(void)
+{
-	char *ptr, *end;
+	char *ptr, *end, *buf;
 	size_t len;
 	if (boot_args == NULL)
 		return;
 	if (!get_bootconf_option(boot_args, "root", BOOTOPT_TYPE_STRING, &ptr))
 		return;
 	if (get_device(ptr, &booted_device, &booted_partition))
 		return;
 	/* NUL-terminate string, get_bootconf_option doesn't */
 	for (end=ptr; *end != '\0'; ++end) {
 		if (*end == ' ' || *end == '\t') {
 			*end = '\0';
 			break;
+		}
+	}
-	bootspec = ptr;
+	if (end == ptr)
 		return;
 	len = end - ptr;
 	buf = kmem_alloc(len + 1, KM_SLEEP);
 	memcpy(buf, ptr, len);
 	buf[len] = '\0';
 	if (bootspec_buf != NULL)
 		kmem_free(bootspec_buf, bootspec_buflen + 1);
 	bootspec_buf = buf;
 	bootspec_buflen = len;
 	bootspec = bootspec_buf;
+}
 #endif
 /*
  * Set up the root device from the boot args
  */
 void
 cpu_rootconf(void)
+{
 #ifndef MEMORY_DISK_IS_ROOT
 	set_root_device();
 #endif
 	aprint_normal("boot device: %s\n",