summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2015-02-11 07:05:40 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2015-02-11 07:05:40 +0000
commit8d7f2c1964df23fdbc680aff4d8508cc3ccd5438 (patch)
tree96f46ae0bd21bd4bbc513f74e4234c2c9afc20fc /sys/arch
parentad5913cac487cf6124985987c03aae56e75bcdc9 (diff)
no md code wants lockmgr locks, so no md code needs to include sys/lock.h
with and ok miod@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/m88k/include/cpu.h3
-rw-r--r--sys/arch/m88k/m88k/m88k_machdep.c4
-rw-r--r--sys/arch/m88k/m88k/mplock.c3
-rw-r--r--sys/arch/macppc/macppc/lock_machdep.c3
-rw-r--r--sys/arch/mips64/include/cpu.h3
-rw-r--r--sys/arch/octeon/dev/cn30xxgmx.c3
-rw-r--r--sys/arch/octeon/octeon/lock_machdep.c3
-rw-r--r--sys/arch/powerpc/include/cpu.h3
-rw-r--r--sys/arch/sgi/dev/iockbc.c3
-rw-r--r--sys/arch/sgi/dev/mkbc.c3
-rw-r--r--sys/arch/sgi/sgi/lock_machdep.c3
-rw-r--r--sys/arch/sh/include/intr.h3
-rw-r--r--sys/arch/solbourne/solbourne/pmap.c3
-rw-r--r--sys/arch/sparc/sparc/pmap.c3
-rw-r--r--sys/arch/zaurus/dev/zaurus_apm.c3
15 files changed, 16 insertions, 30 deletions
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index b763c039854..247f5f31b29 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.62 2014/07/11 10:53:07 uebayasi Exp $ */
+/* $OpenBSD: cpu.h,v 1.63 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1992, 1993
@@ -238,7 +238,6 @@ void set_cpu_number(cpuid_t);
#define cpu_idle_leave() do { /* nothing */ } while (0)
#if defined(MULTIPROCESSOR)
-#include <sys/lock.h>
#include <sys/mplock.h>
#endif
diff --git a/sys/arch/m88k/m88k/m88k_machdep.c b/sys/arch/m88k/m88k/m88k_machdep.c
index 2114cdd6bfe..c4639f65bca 100644
--- a/sys/arch/m88k/m88k/m88k_machdep.c
+++ b/sys/arch/m88k/m88k/m88k_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88k_machdep.c,v 1.63 2014/07/15 16:28:11 miod Exp $ */
+/* $OpenBSD: m88k_machdep.c,v 1.64 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -52,7 +52,6 @@
#include <sys/msgbuf.h>
#include <sys/exec.h>
#include <sys/errno.h>
-#include <sys/lock.h>
#include <sys/malloc.h>
#ifdef MULTIPROCESSOR
#include <sys/mplock.h>
@@ -61,6 +60,7 @@
#include <machine/asm.h>
#include <machine/asm_macro.h>
#include <machine/atomic.h>
+#include <machine/lock.h>
#include <machine/cmmu.h>
#include <machine/cpu.h>
#include <machine/reg.h>
diff --git a/sys/arch/m88k/m88k/mplock.c b/sys/arch/m88k/m88k/mplock.c
index 7bb0fddcbcd..243a9826f54 100644
--- a/sys/arch/m88k/m88k/mplock.c
+++ b/sys/arch/m88k/m88k/mplock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mplock.c,v 1.2 2009/02/21 18:37:48 miod Exp $ */
+/* $OpenBSD: mplock.c,v 1.3 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2004 Niklas Hallqvist. All rights reserved.
@@ -25,7 +25,6 @@
*/
#include <sys/param.h>
-#include <sys/lock.h>
#include <sys/systm.h>
#include <machine/asm_macro.h>
diff --git a/sys/arch/macppc/macppc/lock_machdep.c b/sys/arch/macppc/macppc/lock_machdep.c
index d0fc5428d1c..0936c82ca12 100644
--- a/sys/arch/macppc/macppc/lock_machdep.c
+++ b/sys/arch/macppc/macppc/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.4 2014/09/19 11:40:16 mpi Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.5 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -18,7 +18,6 @@
#include <sys/param.h>
-#include <sys/lock.h>
#include <sys/systm.h>
#include <machine/atomic.h>
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index e7fbc1e15b5..e3ad5627d97 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.103 2014/08/14 17:55:28 tobias Exp $ */
+/* $OpenBSD: cpu.h,v 1.104 2015/02/11 07:05:39 dlg Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -121,7 +121,6 @@
#if defined(_KERNEL) && !defined(_LOCORE)
#include <sys/device.h>
-#include <sys/lock.h>
#include <machine/intr.h>
#include <sys/sched.h>
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index c5d14749bfe..a2ce29348fd 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxgmx.c,v 1.17 2014/12/09 06:58:28 doug Exp $ */
+/* $OpenBSD: cn30xxgmx.c,v 1.18 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -35,7 +35,6 @@
#include <sys/systm.h>
#include <sys/types.h>
#include <sys/device.h>
-#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
diff --git a/sys/arch/octeon/octeon/lock_machdep.c b/sys/arch/octeon/octeon/lock_machdep.c
index cf23388c471..c6d1bbc7057 100644
--- a/sys/arch/octeon/octeon/lock_machdep.c
+++ b/sys/arch/octeon/octeon/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.5 2014/09/30 06:51:58 jmatthew Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.6 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -18,7 +18,6 @@
#include <sys/param.h>
-#include <sys/lock.h>
#include <sys/systm.h>
#include <sys/atomic.h>
diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h
index 567f0433b58..11cc4cc5670 100644
--- a/sys/arch/powerpc/include/cpu.h
+++ b/sys/arch/powerpc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.59 2015/01/04 13:01:42 mpi Exp $ */
+/* $OpenBSD: cpu.h,v 1.60 2015/02/11 07:05:39 dlg Exp $ */
/* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */
/*
@@ -37,7 +37,6 @@
#include <machine/frame.h>
#include <sys/device.h>
-#include <sys/lock.h>
#include <sys/sched.h>
struct cpu_info {
diff --git a/sys/arch/sgi/dev/iockbc.c b/sys/arch/sgi/dev/iockbc.c
index 4bbd8f6337e..f5701fb2f54 100644
--- a/sys/arch/sgi/dev/iockbc.c
+++ b/sys/arch/sgi/dev/iockbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iockbc.c,v 1.10 2013/12/29 18:31:50 miod Exp $ */
+/* $OpenBSD: iockbc.c,v 1.11 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2013, Miodrag Vallat
* Copyright (c) 2006, 2007, 2009 Joel Sing <jsing@openbsd.org>
@@ -59,7 +59,6 @@
#include <sys/signalvar.h>
#include <sys/errno.h>
#include <sys/queue.h>
-#include <sys/lock.h>
#include <machine/autoconf.h>
#include <machine/bus.h>
diff --git a/sys/arch/sgi/dev/mkbc.c b/sys/arch/sgi/dev/mkbc.c
index 751477ec2fd..cb3fe051241 100644
--- a/sys/arch/sgi/dev/mkbc.c
+++ b/sys/arch/sgi/dev/mkbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkbc.c,v 1.12 2012/08/10 17:49:31 shadchin Exp $ */
+/* $OpenBSD: mkbc.c,v 1.13 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2006, 2007, Joel Sing
@@ -74,7 +74,6 @@
#include <sys/signalvar.h>
#include <sys/errno.h>
#include <sys/queue.h>
-#include <sys/lock.h>
#include <machine/autoconf.h>
#include <machine/bus.h>
diff --git a/sys/arch/sgi/sgi/lock_machdep.c b/sys/arch/sgi/sgi/lock_machdep.c
index 3dfa48044cc..44d89d7e375 100644
--- a/sys/arch/sgi/sgi/lock_machdep.c
+++ b/sys/arch/sgi/sgi/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.6 2014/09/30 06:51:58 jmatthew Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.7 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -18,7 +18,6 @@
#include <sys/param.h>
-#include <sys/lock.h>
#include <sys/systm.h>
#include <sys/atomic.h>
diff --git a/sys/arch/sh/include/intr.h b/sys/arch/sh/include/intr.h
index 706b4dc169f..41f83944ec1 100644
--- a/sys/arch/sh/include/intr.h
+++ b/sys/arch/sh/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.8 2010/12/21 14:56:24 claudio Exp $ */
+/* $OpenBSD: intr.h,v 1.9 2015/02/11 07:05:39 dlg Exp $ */
/* $NetBSD: intr.h,v 1.22 2006/01/24 23:51:42 uwe Exp $ */
/*-
@@ -34,7 +34,6 @@
#include <sys/device.h>
#include <sys/evcount.h>
-#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/queue.h>
#include <sh/psl.h>
diff --git a/sys/arch/solbourne/solbourne/pmap.c b/sys/arch/solbourne/solbourne/pmap.c
index 66785433f2c..99576c0a8e5 100644
--- a/sys/arch/solbourne/solbourne/pmap.c
+++ b/sys/arch/solbourne/solbourne/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.8 2014/12/17 15:27:17 deraadt Exp $ */
+/* $OpenBSD: pmap.c,v 1.9 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
*
@@ -30,7 +30,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/proc.h>
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c
index bf7d480e92f..210566b662a 100644
--- a/sys/arch/sparc/sparc/pmap.c
+++ b/sys/arch/sparc/sparc/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.172 2014/12/17 06:58:10 guenther Exp $ */
+/* $OpenBSD: pmap.c,v 1.173 2015/02/11 07:05:39 dlg Exp $ */
/* $NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */
/*
@@ -66,7 +66,6 @@
#include <sys/exec.h>
#include <sys/core.h>
#include <sys/kcore.h>
-#include <sys/lock.h>
#include <sys/pool.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/arch/zaurus/dev/zaurus_apm.c b/sys/arch/zaurus/dev/zaurus_apm.c
index 2624f0a4863..26bb24aae9b 100644
--- a/sys/arch/zaurus/dev/zaurus_apm.c
+++ b/sys/arch/zaurus/dev/zaurus_apm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zaurus_apm.c,v 1.32 2015/02/11 05:07:25 miod Exp $ */
+/* $OpenBSD: zaurus_apm.c,v 1.33 2015/02/11 07:05:39 dlg Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -25,7 +25,6 @@
#include <sys/buf.h>
#include <sys/sysctl.h>
#include <sys/mutex.h>
-#include <sys/lock.h>
#include <sys/reboot.h>
#include <sys/rwlock.h>
#include <dev/rndvar.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 09:25:27 +0000