Module Name: src
Committed By: pooka
Date: Mon Mar 9 15:35:11 UTC 2015
Modified Files:
src/sys/kern: subr_device.c vfs_mount.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_device.c
cvs rdiff -u -r1.32 -r1.33 src/sys/kern/vfs_mount.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/kern/subr_device.c
diff -u src/sys/kern/subr_device.c:1.2 src/sys/kern/subr_device.c:1.3
--- src/sys/kern/subr_device.c:1.2 Sun Jan 31 15:10:12 2010
+++ src/sys/kern/subr_device.c Mon Mar 9 15:35:11 2015
@@ -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.
*/
Index: src/sys/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.32 src/sys/kern/vfs_mount.c:1.33
--- src/sys/kern/vfs_mount.c:1.32 Thu Jan 8 12:06:50 2015
+++ src/sys/kern/vfs_mount.c Mon Mar 9 15:35:11 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,
#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;
