CVS commit: src/sys/arch/evbppc/mpc85xx

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Wed Jul 17 23:25:12 UTC 2013

Modified Files:
        src/sys/arch/evbppc/mpc85xx: autoconf.c

Log Message:
Wait it actually wait.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/mpc85xx/autoconf.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/evbppc/mpc85xx/autoconf.c
diff -u src/sys/arch/evbppc/mpc85xx/autoconf.c:1.7 src/sys/arch/evbppc/mpc85xx/autoconf.c:1.8
--- src/sys/arch/evbppc/mpc85xx/autoconf.c:1.7	Sun Jul 29 21:39:43 2012
+++ src/sys/arch/evbppc/mpc85xx/autoconf.c	Wed Jul 17 23:25:12 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.7 2012/07/29 21:39:43 matt Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.8 2013/07/17 23:25:12 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.7 2012/07/29 21:39:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2013/07/17 23:25:12 matt Exp $");
 
 #define __INTR_PRIVATE
 
@@ -80,7 +80,7 @@ cpu_rootconf(void)
 	/*
 	 * We wait up to 10 seconds for a bootable device to be found.
 	 */
-	while (rootconf_timo-- > 0) {
+	while (rootconf_timo > 0) {
 		if (booted_device != NULL) {
 			aprint_normal_dev(booted_device, "boot device\n");
 			break;
@@ -92,7 +92,9 @@ cpu_rootconf(void)
 			break;
 		}
 
-		kpause("autoconf", true, 1, NULL);
+		if (EWOULDBLOCK == kpause("autoconf", true, 1, NULL)) {
+			rootconf_timo--;
+		}
 	}
 
 	rootconf();