summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-12-17 19:42:16 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-12-17 19:42:16 +0000
commite603d661cd7bc55c2978864f19d9bbe6b4ba9299 (patch)
tree04626f337223921bada1aa3d772abbb4f1ee4901 /sys/kern
parentf767079fc4c95cd1cc568fa1e859f150596b7780 (diff)
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
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/subr_hibernate.c5
-rw-r--r--sys/kern/tty.c3
-rw-r--r--sys/kern/vfs_subr.c3
3 files changed, 8 insertions, 3 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>