Sun Sep 7 22:36:36 2008 UTC ()
Remove what seems to be a debug printf committed by accident.


(cube)
diff -r1.162 -r1.163 src/sys/kern/subr_autoconf.c
cvs diff -r1.162 -r1.163 src/sys/kern/subr_autoconf.c (expand / switch to unified diff)

--- src/sys/kern/subr_autoconf.c 2008/09/01 19:44:05 1.162
+++ src/sys/kern/subr_autoconf.c 2008/09/07 22:36:36 1.163
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: subr_autoconf.c,v 1.162 2008/09/01 19:44:05 drochner Exp $ */ 1/* $NetBSD: subr_autoconf.c,v 1.163 2008/09/07 22:36:36 cube Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1996, 2000 Christopher G. Demetriou 4 * Copyright (c) 1996, 2000 Christopher G. Demetriou
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -67,27 +67,27 @@ @@ -67,27 +67,27 @@
67 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 67 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
68 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 68 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
69 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 69 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
70 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 70 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
71 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 71 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
72 * SUCH DAMAGE. 72 * SUCH DAMAGE.
73 * 73 *
74 * from: Header: subr_autoconf.c,v 1.12 93/02/01 19:31:48 torek Exp (LBL) 74 * from: Header: subr_autoconf.c,v 1.12 93/02/01 19:31:48 torek Exp (LBL)
75 * 75 *
76 * @(#)subr_autoconf.c 8.3 (Berkeley) 5/17/94 76 * @(#)subr_autoconf.c 8.3 (Berkeley) 5/17/94
77 */ 77 */
78 78
79#include <sys/cdefs.h> 79#include <sys/cdefs.h>
80__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.162 2008/09/01 19:44:05 drochner Exp $"); 80__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.163 2008/09/07 22:36:36 cube Exp $");
81 81
82#include "opt_ddb.h" 82#include "opt_ddb.h"
83#include "drvctl.h" 83#include "drvctl.h"
84 84
85#include <sys/param.h> 85#include <sys/param.h>
86#include <sys/device.h> 86#include <sys/device.h>
87#include <sys/disklabel.h> 87#include <sys/disklabel.h>
88#include <sys/conf.h> 88#include <sys/conf.h>
89#include <sys/kauth.h> 89#include <sys/kauth.h>
90#include <sys/malloc.h> 90#include <sys/malloc.h>
91#include <sys/kmem.h> 91#include <sys/kmem.h>
92#include <sys/systm.h> 92#include <sys/systm.h>
93#include <sys/kernel.h> 93#include <sys/kernel.h>
@@ -1233,27 +1233,26 @@ config_devalloc(const device_t parent, c @@ -1233,27 +1233,26 @@ config_devalloc(const device_t parent, c
1233 if (ca->ca_devsize > 0) { 1233 if (ca->ca_devsize > 0) {
1234 dev_private = kmem_zalloc(ca->ca_devsize, kmflags); 1234 dev_private = kmem_zalloc(ca->ca_devsize, kmflags);
1235 if (dev_private == NULL) 1235 if (dev_private == NULL)
1236 panic("config_devalloc: memory allocation for device softc failed"); 1236 panic("config_devalloc: memory allocation for device softc failed");
1237 } else { 1237 } else {
1238 KASSERT(ca->ca_flags & DVF_PRIV_ALLOC); 1238 KASSERT(ca->ca_flags & DVF_PRIV_ALLOC);
1239 dev_private = NULL; 1239 dev_private = NULL;
1240 } 1240 }
1241 1241
1242 if ((ca->ca_flags & DVF_PRIV_ALLOC) != 0) { 1242 if ((ca->ca_flags & DVF_PRIV_ALLOC) != 0) {
1243 dev = kmem_zalloc(sizeof(*dev), kmflags); 1243 dev = kmem_zalloc(sizeof(*dev), kmflags);
1244 } else { 1244 } else {
1245 dev = dev_private; 1245 dev = dev_private;
1246 printf("%s is not split\n", cd->cd_name); 
1247 } 1246 }
1248 if (dev == NULL) 1247 if (dev == NULL)
1249 panic("config_devalloc: memory allocation for device_t failed"); 1248 panic("config_devalloc: memory allocation for device_t failed");
1250 1249
1251 dev->dv_class = cd->cd_class; 1250 dev->dv_class = cd->cd_class;
1252 dev->dv_cfdata = cf; 1251 dev->dv_cfdata = cf;
1253 dev->dv_cfdriver = cd; 1252 dev->dv_cfdriver = cd;
1254 dev->dv_cfattach = ca; 1253 dev->dv_cfattach = ca;
1255 dev->dv_unit = myunit; 1254 dev->dv_unit = myunit;
1256 dev->dv_activity_count = 0; 1255 dev->dv_activity_count = 0;
1257 dev->dv_activity_handlers = NULL; 1256 dev->dv_activity_handlers = NULL;
1258 dev->dv_private = dev_private; 1257 dev->dv_private = dev_private;
1259 memcpy(dev->dv_xname, cd->cd_name, lname); 1258 memcpy(dev->dv_xname, cd->cd_name, lname);