[src/trunk]: src/sys/kern Fix kernel build on platforms which define __BROKEN...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c08abb5fb196
branches:  trunk
changeset: 749428:c08abb5fb196
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Nov 29 15:17:30 2009 +0000

description:
Fix kernel build on platforms which define __BROKEN_CONFIG_UNIT_USAGE
and therefore don't take config_alldevs_lock() in config_devalloc().

diffstat:

 sys/kern/subr_autoconf.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 73c91035ae8c -r c08abb5fb196 sys/kern/subr_autoconf.c
--- a/sys/kern/subr_autoconf.c  Sun Nov 29 15:13:22 2009 +0000
+++ b/sys/kern/subr_autoconf.c  Sun Nov 29 15:17:30 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.188 2009/11/12 23:16:28 dyoung Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.189 2009/11/29 15:17:30 pooka Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.188 2009/11/12 23:16:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.189 2009/11/29 15:17:30 pooka Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -1082,12 +1082,15 @@
        struct cfattach *ca;
        size_t lname, lunit;
        const char *xunit;
-       int myunit, s;
+       int myunit;
        char num[10];
        device_t dev;
        void *dev_private;
        const struct cfiattrdata *ia;
        device_lock_t dvl;
+#ifndef __BROKEN_CONFIG_UNIT_USAGE
+       int s;
+#endif
 
        cd = config_cfdriver_lookup(cf->cf_name);
        if (cd == NULL)