From aad9af2ba3fb10cf1f80ac6117e37f97d38ccee0 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 15 Oct 1996 18:24:34 +0000
Subject: [PATCH] Removed nested include of <sys/proc.h> from <vm/vm_object.h>
 and fixed the one place that depended on it.  wakeup() is now prototyped in
 <sys/systm.h> so that it is normally visible.

Added nested include of <sys/queue.h> in <vm/vm_object.h>.  The queue
macros are a more fundamental prerequisite for <vm/vm_object.h> than
the wakeup prototype and previously happened to be included by
namespace pollution from <sys/proc.h> or elsewhere.
---
 sys/alpha/linux/linux_sysvec.c | 3 ++-
 sys/i386/linux/linux_sysvec.c  | 3 ++-
 sys/vm/vm_object.h             | 6 ++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index f2c7ba6ac97..aa9c2d68bae 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.6 1996/06/12 05:06:29 gpalmer Exp $
+ *  $Id: linux_sysvec.c,v 1.7 1996/06/18 05:15:53 dyson Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -33,6 +33,7 @@
 
 #include <sys/param.h>
 #include <sys/buf.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index f2c7ba6ac97..aa9c2d68bae 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.6 1996/06/12 05:06:29 gpalmer Exp $
+ *  $Id: linux_sysvec.c,v 1.7 1996/06/18 05:15:53 dyson Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -33,6 +33,7 @@
 
 #include <sys/param.h>
 #include <sys/buf.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/sysent.h>
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 5780470d039..e62a14b4658 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.h,v 1.30 1996/09/08 20:44:43 dyson Exp $
+ * $Id: vm_object.h,v 1.31 1996/09/28 03:33:31 dyson Exp $
  */
 
 /*
@@ -71,9 +71,7 @@
 #ifndef	_VM_OBJECT_
 #define	_VM_OBJECT_
 
-#ifdef KERNEL
-#include <sys/proc.h>		/* XXX for wakeup() */
-#endif
+#include <sys/queue.h>
 
 enum obj_type { OBJT_DEFAULT, OBJT_SWAP, OBJT_VNODE, OBJT_DEVICE };
 typedef enum obj_type objtype_t;