Skip to content

Commit

Permalink
The use of root_device is not limited to vfs, so don't supply it in
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pooka committed Mar 9, 2015
1 parent 24bf1c4 commit f07d15e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
7 changes: 5 additions & 2 deletions sys/kern/subr_device.c
@@ -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.
Expand Down Expand Up @@ -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.
*/
Expand Down
7 changes: 3 additions & 4 deletions sys/kern/vfs_mount.c
@@ -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.
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -96,9 +96,8 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.32 2015/01/08 12:06:50 hannken Exp $
#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;
Expand Down

0 comments on commit f07d15e

Please sign in to comment.