From 03d1830d007e3a69f3003837cde28cc1014c0218 Mon Sep 17 00:00:00 2001
From: tedu <tedu@openbsd.org>
Date: Wed, 17 Dec 2014 19:42:15 +0000
Subject: [PATCH] remove lock.h from uvm_extern.h. another holdover from the
 simpletonlock era. fix uvm including c files to include lock.h or atomic.h as
 necessary. ok deraadt

---
 sys/kern/subr_hibernate.c | 5 ++++-
 sys/kern/tty.c            | 3 ++-
 sys/kern/vfs_subr.c       | 3 ++-
 sys/tmpfs/tmpfs.h         | 3 ++-
 sys/uvm/uvm_amap.c        | 3 ++-
 sys/uvm/uvm_anon.c        | 3 ++-
 sys/uvm/uvm_aobj.c        | 3 ++-
 sys/uvm/uvm_extern.h      | 3 +--
 sys/uvm/uvm_object.c      | 3 ++-
 sys/uvm/uvm_pager.c       | 4 ++--
 sys/uvm/uvm_pdaemon.c     | 4 ++--
 sys/uvm/uvm_vnode.c       | 3 ++-
 12 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c
index 16303cd2e55..e689acad7d8 100644
--- a/sys/kern/subr_hibernate.c
+++ b/sys/kern/subr_hibernate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_hibernate.c,v 1.109 2014/11/16 12:31:00 deraadt Exp $	*/
+/*	$OpenBSD: subr_hibernate.c,v 1.110 2014/12/17 19:42:15 tedu Exp $	*/
 
 /*
  * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl>
@@ -28,8 +28,11 @@
 #include <sys/buf.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
+#include <sys/atomic.h>
+
 #include <uvm/uvm.h>
 #include <uvm/uvm_swap.h>
+
 #include <machine/hibernate.h>
 
 /*
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 1dfa07edcd3..c9b8cc6adbe 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.118 2014/12/16 18:30:04 tedu Exp $	*/
+/*	$OpenBSD: tty.c,v 1.119 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $	*/
 
 /*-
@@ -49,6 +49,7 @@
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
+#include <sys/lock.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/signalvar.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index b2e3bc4b1d0..225e0a89c8e 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.225 2014/12/16 18:30:04 tedu Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.226 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -50,6 +50,7 @@
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
+#include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/acct.h>
 #include <sys/namei.h>
diff --git a/sys/tmpfs/tmpfs.h b/sys/tmpfs/tmpfs.h
index 8a606a5bc04..5a98ec48894 100644
--- a/sys/tmpfs/tmpfs.h
+++ b/sys/tmpfs/tmpfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tmpfs.h,v 1.6 2014/12/16 18:30:04 tedu Exp $	*/
+/*	$OpenBSD: tmpfs.h,v 1.7 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: tmpfs.h,v 1.45 2011/09/27 01:10:43 christos Exp $	*/
 
 /*
@@ -44,6 +44,7 @@
 #include <sys/queue.h>
 #include <sys/stdint.h>
 #include <sys/rwlock.h>
+#include <sys/lock.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/uvm/uvm_amap.c b/sys/uvm/uvm_amap.c
index 6acc23a3c53..e3cdbf3d712 100644
--- a/sys/uvm/uvm_amap.c
+++ b/sys/uvm/uvm_amap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_amap.c,v 1.56 2014/12/09 07:16:41 doug Exp $	*/
+/*	$OpenBSD: uvm_amap.c,v 1.57 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: uvm_amap.c,v 1.27 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -38,6 +38,7 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/pool.h>
+#include <sys/atomic.h>
 
 #include <uvm/uvm.h>
 #include <uvm/uvm_swap.h>
diff --git a/sys/uvm/uvm_anon.c b/sys/uvm/uvm_anon.c
index 72823d7fe8d..d66b79d2704 100644
--- a/sys/uvm/uvm_anon.c
+++ b/sys/uvm/uvm_anon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_anon.c,v 1.41 2014/11/16 12:31:00 deraadt Exp $	*/
+/*	$OpenBSD: uvm_anon.c,v 1.42 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: uvm_anon.c,v 1.10 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -35,6 +35,7 @@
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/kernel.h>
+#include <sys/atomic.h>
 
 #include <uvm/uvm.h>
 #include <uvm/uvm_swap.h>
diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c
index 7ac8883f0bb..f7678213545 100644
--- a/sys/uvm/uvm_aobj.c
+++ b/sys/uvm/uvm_aobj.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_aobj.c,v 1.73 2014/12/09 07:16:41 doug Exp $	*/
+/*	$OpenBSD: uvm_aobj.c,v 1.74 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: uvm_aobj.c,v 1.39 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -43,6 +43,7 @@
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/stdint.h>
+#include <sys/atomic.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h
index 62d3ea9ff36..475a81a0bc6 100644
--- a/sys/uvm/uvm_extern.h
+++ b/sys/uvm/uvm_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_extern.h,v 1.127 2014/12/16 18:30:04 tedu Exp $	*/
+/*	$OpenBSD: uvm_extern.h,v 1.128 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: uvm_extern.h,v 1.57 2001/03/09 01:02:12 chs Exp $	*/
 
 /*
@@ -165,7 +165,6 @@ typedef int		vm_prot_t;
 
 #include <sys/queue.h>
 #include <sys/tree.h>
-#include <sys/lock.h>
 #include <sys/mman.h>
 
 #ifdef _KERNEL
diff --git a/sys/uvm/uvm_object.c b/sys/uvm/uvm_object.c
index 519a8e585bc..cd0abfa74d4 100644
--- a/sys/uvm/uvm_object.c
+++ b/sys/uvm/uvm_object.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_object.c,v 1.11 2014/12/17 06:58:11 guenther Exp $	*/
+/*	$OpenBSD: uvm_object.c,v 1.12 2014/12/17 19:42:15 tedu Exp $	*/
 
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
 
 #include <sys/param.h>
 #include <sys/mman.h>
+#include <sys/atomic.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c
index 63b276f1a7f..b5aa6c9dcdf 100644
--- a/sys/uvm/uvm_pager.c
+++ b/sys/uvm/uvm_pager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_pager.c,v 1.70 2014/11/16 12:31:00 deraadt Exp $	*/
+/*	$OpenBSD: uvm_pager.c,v 1.71 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: uvm_pager.c,v 1.36 2000/11/27 18:26:41 chs Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
-#include <sys/vnode.h>
 #include <sys/buf.h>
+#include <sys/atomic.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c
index 32d7b40060a..1e661a04e19 100644
--- a/sys/uvm/uvm_pdaemon.c
+++ b/sys/uvm/uvm_pdaemon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_pdaemon.c,v 1.74 2014/11/16 12:31:00 deraadt Exp $	*/
+/*	$OpenBSD: uvm_pdaemon.c,v 1.75 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: uvm_pdaemon.c,v 1.23 2000/08/20 10:24:14 bjh21 Exp $	*/
 
 /* 
@@ -71,8 +71,8 @@
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/buf.h>
-#include <sys/vnode.h>
 #include <sys/mount.h>
+#include <sys/atomic.h>
 
 #ifdef HIBERNATE
 #include <sys/hibernate.h>
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index c53b7f38a14..7a3578efc8a 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_vnode.c,v 1.86 2014/12/16 18:30:04 tedu Exp $	*/
+/*	$OpenBSD: uvm_vnode.c,v 1.87 2014/12/17 19:42:15 tedu Exp $	*/
 /*	$NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $	*/
 
 /*
@@ -50,6 +50,7 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
+#include <sys/lock.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
-- 
2.20.1