summaryrefslogtreecommitdiffstats
path: root/sys/vm
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-08-09 10:35:05 +0000
committerphk <phk@FreeBSD.org>1999-08-09 10:35:05 +0000
commitee871b6440719fbe58a0cb8e994ad543265f4e1a (patch)
tree5e644fe7bdaf6b601abb674aac52092ad3fd8b45 /sys/vm
parentf0f8bd1b55697613d6f80eb5c65838ecc4b246e6 (diff)
downloadFreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.zip
FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.tar.gz
Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/vm_object.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 22682b7..91feed0 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_object.c,v 1.160 1999/07/16 05:11:36 alc Exp $
+ * $Id: vm_object.c,v 1.161 1999/08/01 06:05:09 alc Exp $
*/
/*
@@ -1523,7 +1523,7 @@ vm_object_coalesce(prev_object, prev_pindex, prev_size, next_size)
#ifdef DDB
#include <sys/kernel.h>
-#include <machine/cons.h>
+#include <sys/cons.h>
#include <ddb/ddb.h>
OpenPOWER on IntegriCloud