[src/trunk]: src/sys/kern The use of root_device is not limited to vfs, so do...

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

details:   https://anonhg.NetBSD.org/src/rev/9f85b3a77a3f
branches:  trunk
changeset: 336673:9f85b3a77a3f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Mar 09 15:35:11 2015 +0000

description:
The use of root_device is not limited to vfs, so don't supply it in
vfs_mount.c, use subr_device.c instead.

Fixes rump kernels built with DEBUG by again not making the base depend
on the vfs faction, as reported by Patrick Welche.

diffstat:

 sys/kern/subr_device.c |  7 +++++--
 sys/kern/vfs_mount.c   |  7 +++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r 77c33a1ecac7 -r 9f85b3a77a3f sys/kern/subr_device.c
--- a/sys/kern/subr_device.c    Mon Mar 09 13:24:21 2015 +0000
+++ b/sys/kern/subr_device.c    Mon Mar 09 15:35:11 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_device.c,v 1.2 2010/01/31 15:10:12 pooka Exp $    */
+/*     $NetBSD: subr_device.c,v 1.3 2015/03/09 15:35:11 pooka Exp $    */
 
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -27,12 +27,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_device.c,v 1.2 2010/01/31 15:10:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_device.c,v 1.3 2015/03/09 15:35:11 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 
+/* Root device. */
+device_t                       root_device;
+
 /*
  * Accessor functions for the device_t type.
  */
diff -r 77c33a1ecac7 -r 9f85b3a77a3f sys/kern/vfs_mount.c
--- a/sys/kern/vfs_mount.c      Mon Mar 09 13:24:21 2015 +0000
+++ b/sys/kern/vfs_mount.c      Mon Mar 09 15:35:11 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_mount.c,v 1.32 2015/01/08 12:06:50 hannken Exp $   */
+/*     $NetBSD: vfs_mount.c,v 1.33 2015/03/09 15:35:11 pooka Exp $     */
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.32 2015/01/08 12:06:50 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.33 2015/03/09 15:35:11 pooka Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -96,9 +96,8 @@
 #include <miscfs/syncfs/syncfs.h>
 #include <miscfs/specfs/specdev.h>
 
-/* Root filesystem and device. */
+/* Root filesystem. */
 vnode_t *                      rootvnode;
-device_t                       root_device;
 
 /* Mounted filesystem list. */
 struct mntlist                 mountlist;