Module Name: src
Committed By: dyoung
Date: Thu Jan 7 22:39:52 UTC 2010
Modified Files:
src/sys/kern: subr_autoconf.c
src/sys/sys: device.h
Log Message:
Add a do-nothing child-detachment hook, null_childdetached(device_t,
device_t).
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.128 -r1.129 src/sys/sys/device.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.191 src/sys/kern/subr_autoconf.c:1.192
--- src/sys/kern/subr_autoconf.c:1.191 Tue Jan 5 22:42:16 2010
+++ src/sys/kern/subr_autoconf.c Thu Jan 7 22:39:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.191 2010/01/05 22:42:16 dyoung Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.192 2010/01/07 22:39:52 dyoung 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.191 2010/01/05 22:42:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.192 2010/01/07 22:39:52 dyoung Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -2722,6 +2722,12 @@
config_alldevs_unlock(s);
}
+void
+null_childdetached(device_t self, device_t child)
+{
+ /* do nothing */
+}
+
static void
sysctl_detach_setup(struct sysctllog **clog)
{
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.128 src/sys/sys/device.h:1.129
--- src/sys/sys/device.h:1.128 Tue Dec 15 03:02:25 2009
+++ src/sys/sys/device.h Thu Jan 7 22:39:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.128 2009/12/15 03:02:25 dyoung Exp $ */
+/* $NetBSD: device.h,v 1.129 2010/01/07 22:39:52 dyoung Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -479,6 +479,8 @@
void config_twiddle_init(void);
void config_twiddle_fn(void *);
+void null_childdetached(device_t, device_t);
+
device_t device_lookup(cfdriver_t, int);
void *device_lookup_private(cfdriver_t, int);
#ifdef __HAVE_DEVICE_REGISTER