Don't #include <machine/smp.h> even in the SMP case. Fixed the one

place that depended on it.  The "bazillion warnings" mentioned in the
log for rev.1.45 apparently aren't a problem any more.  It is hard
to be sure because the SIMPLELOCK_DEBUG option turns off (and breaks)
things in the SMP case.

Don't forward declare structs that are already implicitly forward declared.

Fixed a disordered declaration.

1 files changed, 2 insertions, 9 deletions

diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index a1abbc7..49c078c 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.54 1997/10/26 20:26:14 phk Exp $
+ * $Id: vnode.h,v 1.55 1997/10/26 20:54:57 phk Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -40,10 +40,6 @@
 #include <sys/lock.h>
 #include <sys/queue.h>
 
-#ifdef SMP
-#include <machine/smp.h>
-#endif
-
 /*
  * The vnode is the focus of all file activity in UNIX.  There is a
  * unique vnode allocated for each active file, each current directory,
@@ -73,7 +69,6 @@ enum vtagtype	{
 LIST_HEAD(buflists, buf);
 
 typedef	int 	vop_t __P((void *));
-struct vm_object;
 struct namecache;
 
 /*
@@ -249,6 +244,7 @@ extern int		vttoif_tab[];
  */
 extern	struct vnode *rootvnode;	/* root (i.e. "/") vnode */
 extern	int desiredvnodes;		/* number of vnodes desired */
+extern	struct vm_zone *namei_zone;
 extern	int prtactive;			/* nonzero to call vprint() */
 extern	struct vattr va_null;		/* predefined null vattr structure */
 
@@ -443,9 +439,6 @@ struct uio;
 struct vattr;
 struct vnode;
 struct vop_bwrite_args;
-struct vm_zone;
-
-extern struct vm_zone *namei_zone;
 
 extern int	(*lease_check_hook) __P((struct vop_lease_args *));