diff options
27 files changed, 63 insertions, 32 deletions
diff --git a/sys/arch/alpha/alpha/mem.c b/sys/arch/alpha/alpha/mem.c index fc09c66d6f1..01ec48b47d5 100644 --- a/sys/arch/alpha/alpha/mem.c +++ b/sys/arch/alpha/alpha/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.23 2008/11/05 06:32:47 matthieu Exp $ */ +/* $OpenBSD: mem.c,v 1.24 2010/04/21 03:03:25 deraadt Exp $ */ /* $NetBSD: mem.c,v 1.26 2000/03/29 03:48:20 simonb Exp $ */ /* @@ -44,6 +44,7 @@ #include <sys/param.h> #include <sys/buf.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/uio.h> #include <sys/malloc.h> #include <sys/msgbuf.h> diff --git a/sys/arch/arm/arm/syscall.c b/sys/arch/arm/arm/syscall.c index 55159537200..7292bb599da 100644 --- a/sys/arch/arm/arm/syscall.c +++ b/sys/arch/arm/arm/syscall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.c,v 1.10 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: syscall.c,v 1.11 2010/04/21 03:03:25 deraadt Exp $ */ /* $NetBSD: syscall.c,v 1.24 2003/11/14 19:03:17 scw Exp $ */ /*- @@ -79,6 +79,7 @@ #include <sys/signalvar.h> #include <sys/syscall.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/user.h> #ifdef KTRACE #include <sys/ktrace.h> diff --git a/sys/arch/arm/include/atomic.h b/sys/arch/arm/include/atomic.h index 280a48d59ca..a6a27b36b72 100644 --- a/sys/arch/arm/include/atomic.h +++ b/sys/arch/arm/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.5 2007/03/17 23:42:06 drahn Exp $ */ +/* $OpenBSD: atomic.h,v 1.6 2010/04/21 03:03:25 deraadt Exp $ */ /* Public Domain */ @@ -7,6 +7,9 @@ #if defined(_KERNEL) +#include <arm/armreg.h> +#include <arm/cpufunc.h> + /* * on pre-v6 arm processors, it is necessary to disable interrupts if * in the kernel and atomic updates are necessary without full mutexes diff --git a/sys/arch/arm/include/lock.h b/sys/arch/arm/include/lock.h index ec0670a9495..d8d581eb1c1 100644 --- a/sys/arch/arm/include/lock.h +++ b/sys/arch/arm/include/lock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.h,v 1.3 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: lock.h,v 1.4 2010/04/21 03:03:25 deraadt Exp $ */ /* $NetBSD: lock.h,v 1.3 2002/10/07 23:19:49 bjh21 Exp $ */ /*- @@ -42,6 +42,8 @@ #ifndef _ARM_LOCK_H_ #define _ARM_LOCK_H_ +#include <arm/atomic.h> + typedef __volatile int __cpu_simple_lock_t; #define __SIMPLELOCK_LOCKED 1 diff --git a/sys/arch/landisk/landisk/bus_dma.c b/sys/arch/landisk/landisk/bus_dma.c index 07e8a176392..39ef56c0639 100644 --- a/sys/arch/landisk/landisk/bus_dma.c +++ b/sys/arch/landisk/landisk/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.8 2009/04/20 00:42:06 oga Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.9 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: bus_dma.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /* @@ -28,6 +28,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/kernel.h> #include <sys/device.h> #include <sys/malloc.h> diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c index 8ca9505208a..142a2afe1e6 100644 --- a/sys/arch/landisk/landisk/machdep.c +++ b/sys/arch/landisk/landisk/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.18 2010/04/17 18:30:41 jasper Exp $ */ +/* $OpenBSD: machdep.c,v 1.19 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -70,6 +70,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/proc.h> #include <sys/user.h> #include <sys/mount.h> #include <sys/reboot.h> diff --git a/sys/arch/loongson/dev/glxpcib.c b/sys/arch/loongson/dev/glxpcib.c index 1d77c31cd74..a11de01827d 100644 --- a/sys/arch/loongson/dev/glxpcib.c +++ b/sys/arch/loongson/dev/glxpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glxpcib.c,v 1.4 2010/02/18 22:45:28 miod Exp $ */ +/* $OpenBSD: glxpcib.c,v 1.5 2010/04/21 03:03:26 deraadt Exp $ */ /* * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org> @@ -24,9 +24,9 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/device.h> #include <sys/gpio.h> -#include <sys/sysctl.h> #include <sys/timetc.h> #include <machine/bus.h> diff --git a/sys/arch/loongson/loongson/loongson2_machdep.c b/sys/arch/loongson/loongson/loongson2_machdep.c index 2d3bdd11652..5b5b623c90d 100644 --- a/sys/arch/loongson/loongson/loongson2_machdep.c +++ b/sys/arch/loongson/loongson/loongson2_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loongson2_machdep.c,v 1.8 2010/02/28 12:36:46 otto Exp $ */ +/* $OpenBSD: loongson2_machdep.c,v 1.9 2010/04/21 03:03:26 deraadt Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -19,6 +19,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/proc.h> #include <sys/sysctl.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c index 2f24b75bda5..5d534460fb1 100644 --- a/sys/arch/macppc/dev/if_mc.c +++ b/sys/arch/macppc/dev/if_mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc.c,v 1.13 2008/11/28 02:44:17 brad Exp $ */ +/* $OpenBSD: if_mc.c,v 1.14 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $ */ /*- @@ -44,6 +44,7 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/device.h> +#include <sys/timeout.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c index e808698943a..fb500c4975f 100644 --- a/sys/arch/macppc/macppc/ofw_machdep.c +++ b/sys/arch/macppc/macppc/ofw_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_machdep.c,v 1.34 2008/09/30 22:42:55 kettenis Exp $ */ +/* $OpenBSD: ofw_machdep.c,v 1.35 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -42,6 +42,7 @@ #include <sys/malloc.h> #include <sys/stat.h> #include <sys/systm.h> +#include <sys/timeout.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/macppc/macppc/rbus_machdep.c b/sys/arch/macppc/macppc/rbus_machdep.c index b4cce887967..87f5a26fbbb 100644 --- a/sys/arch/macppc/macppc/rbus_machdep.c +++ b/sys/arch/macppc/macppc/rbus_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.c,v 1.9 2010/01/13 09:10:33 jsg Exp $ */ +/* $OpenBSD: rbus_machdep.c,v 1.10 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: rbus_machdep.c,v 1.2 1999/10/15 06:43:06 haya Exp $ */ /* @@ -29,13 +29,12 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/extent.h> - -#include <uvm/uvm_extern.h> - +#include <sys/proc.h> #include <sys/sysctl.h> - #include <sys/device.h> +#include <uvm/uvm_extern.h> + #include <machine/bus.h> #include <dev/cardbus/rbus.h> diff --git a/sys/arch/mips64/include/lock.h b/sys/arch/mips64/include/lock.h index 37b9961608b..1d28d83757a 100644 --- a/sys/arch/mips64/include/lock.h +++ b/sys/arch/mips64/include/lock.h @@ -1,10 +1,12 @@ -/* $OpenBSD: lock.h,v 1.3 2009/11/21 23:28:14 syuu Exp $ */ +/* $OpenBSD: lock.h,v 1.4 2010/04/21 03:03:26 deraadt Exp $ */ /* public domain */ #ifndef _MIPS64_LOCK_H_ #define _MIPS64_LOCK_H_ +#include <mips64/atomic.h> + typedef volatile u_int __cpu_simple_lock_t; #define __SIMPLELOCK_LOCKED 1 diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index 2c0030d7cf7..4ee5e9b8c8f 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.58 2010/02/13 14:04:45 miod Exp $ */ +/* $OpenBSD: interrupt.c,v 1.59 2010/04/21 03:03:26 deraadt Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -29,6 +29,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/proc.h> #include <sys/user.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/mips64/mips64/sendsig.c b/sys/arch/mips64/mips64/sendsig.c index 8f8a924e4fd..9773c39eb42 100644 --- a/sys/arch/mips64/mips64/sendsig.c +++ b/sys/arch/mips64/mips64/sendsig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sendsig.c,v 1.11 2010/01/08 01:35:52 syuu Exp $ */ +/* $OpenBSD: sendsig.c,v 1.12 2010/04/21 03:03:26 deraadt Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -65,6 +65,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/signalvar.h> +#include <sys/proc.h> #include <sys/user.h> #include <sys/exec.h> #include <sys/mount.h> diff --git a/sys/arch/sgi/sgi/ip27_machdep.c b/sys/arch/sgi/sgi/ip27_machdep.c index c520a21a0af..15d165dfadd 100644 --- a/sys/arch/sgi/sgi/ip27_machdep.c +++ b/sys/arch/sgi/sgi/ip27_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip27_machdep.c,v 1.49 2010/04/17 11:05:53 miod Exp $ */ +/* $OpenBSD: ip27_machdep.c,v 1.50 2010/04/21 03:03:26 deraadt Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -37,6 +37,7 @@ #include <machine/cpu.h> #include <machine/memconf.h> #include <machine/mnode.h> +#include <machine/atomic.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/sgi/xbow/xbridge.c b/sys/arch/sgi/xbow/xbridge.c index b2d9bc22741..d380c55925f 100644 --- a/sys/arch/sgi/xbow/xbridge.c +++ b/sys/arch/sgi/xbow/xbridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbridge.c,v 1.70 2010/04/06 19:12:34 miod Exp $ */ +/* $OpenBSD: xbridge.c,v 1.71 2010/04/21 03:03:26 deraadt Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -32,6 +32,7 @@ #include <sys/device.h> #include <sys/evcount.h> #include <sys/malloc.h> +#include <sys/proc.h> #include <sys/extent.h> #include <sys/mbuf.h> #include <sys/mutex.h> diff --git a/sys/arch/sh/sh/db_interface.c b/sys/arch/sh/sh/db_interface.c index d98debebcbc..b74e46673ea 100644 --- a/sys/arch/sh/sh/db_interface.c +++ b/sys/arch/sh/sh/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.2 2006/10/06 21:16:57 mickey Exp $ */ +/* $OpenBSD: db_interface.c,v 1.3 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: db_interface.c,v 1.37 2006/09/06 00:11:49 uwe Exp $ */ /*- @@ -30,6 +30,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/user.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/sh/sh/locore_c.c b/sys/arch/sh/sh/locore_c.c index c86989238ef..0ede4c83f1c 100644 --- a/sys/arch/sh/sh/locore_c.c +++ b/sys/arch/sh/sh/locore_c.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore_c.c,v 1.7 2008/06/26 05:42:13 ray Exp $ */ +/* $OpenBSD: locore_c.c,v 1.8 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: locore_c.c,v 1.13 2006/03/04 01:13:35 uwe Exp $ */ /*- @@ -106,6 +106,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/user.h> #include <sys/sched.h> #include <sys/proc.h> diff --git a/sys/arch/sh/sh/pmap.c b/sys/arch/sh/sh/pmap.c index c4c990ecd19..a32a73113de 100644 --- a/sys/arch/sh/sh/pmap.c +++ b/sys/arch/sh/sh/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.13 2010/01/01 13:17:52 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.14 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: pmap.c,v 1.55 2006/08/07 23:19:36 tsutsui Exp $ */ /*- @@ -32,6 +32,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/pool.h> #include <sys/msgbuf.h> diff --git a/sys/arch/socppc/socppc/fdt.c b/sys/arch/socppc/socppc/fdt.c index 96b28c43c4e..410c41ececc 100644 --- a/sys/arch/socppc/socppc/fdt.c +++ b/sys/arch/socppc/socppc/fdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdt.c,v 1.8 2010/04/20 23:35:16 deraadt Exp $ */ +/* $OpenBSD: fdt.c,v 1.9 2010/04/21 03:03:26 deraadt Exp $ */ /* * Copyright (c) 2009 Dariusz Swiderski <sfires@sfires.net> @@ -20,6 +20,7 @@ #include <sys/types.h> #include <sys/param.h> +#include <sys/systm.h> #include <machine/fdt.h> diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c index 1559d799615..01b8af4b162 100644 --- a/sys/arch/sparc/dev/if_ie.c +++ b/sys/arch/sparc/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.40 2009/10/31 14:31:11 deraadt Exp $ */ +/* $OpenBSD: if_ie.c,v 1.41 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $ */ /*- @@ -110,6 +110,7 @@ Mode of operation: #include <sys/errno.h> #include <sys/syslog.h> #include <sys/device.h> +#include <sys/timeout.h> #include <net/if.h> #include <net/if_types.h> diff --git a/sys/arch/sparc/include/atomic.h b/sys/arch/sparc/include/atomic.h index 0788777e6a3..0f057e147b4 100644 --- a/sys/arch/sparc/include/atomic.h +++ b/sys/arch/sparc/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.3 2007/04/27 19:22:47 miod Exp $ */ +/* $OpenBSD: atomic.h,v 1.4 2010/04/21 03:03:24 deraadt Exp $ */ /* Public Domain */ @@ -7,6 +7,8 @@ #if defined(_KERNEL) +#include <machine/psl.h> + static __inline void atomic_setbits_int(__volatile unsigned int *uip, unsigned int v) { diff --git a/sys/arch/sparc/include/lock.h b/sys/arch/sparc/include/lock.h index e9fa9224a53..88b50a751d4 100644 --- a/sys/arch/sparc/include/lock.h +++ b/sys/arch/sparc/include/lock.h @@ -1,10 +1,12 @@ -/* $OpenBSD: lock.h,v 1.1 2007/05/01 18:56:31 miod Exp $ */ +/* $OpenBSD: lock.h,v 1.2 2010/04/21 03:03:24 deraadt Exp $ */ /* public domain */ #ifndef _SPARC_LOCK_H_ #define _SPARC_LOCK_H_ +#include <machine/atomic.h> + typedef volatile u_int8_t __cpu_simple_lock_t; #define __SIMPLELOCK_LOCKED 0xff diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 866fd7e09d0..6e427f7ea3f 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.83 2009/10/26 20:17:27 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.84 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -56,6 +56,7 @@ #include <sys/socket.h> #include <sys/malloc.h> #include <sys/queue.h> +#include <sys/proc.h> #include <sys/user.h> #include <net/if.h> diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c index 992134e556b..dbf21da371d 100644 --- a/sys/arch/sparc/sparc/iommu.c +++ b/sys/arch/sparc/sparc/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.22 2009/07/13 19:50:00 kettenis Exp $ */ +/* $OpenBSD: iommu.c,v 1.23 2010/04/21 03:03:26 deraadt Exp $ */ /* $NetBSD: iommu.c,v 1.13 1997/07/29 09:42:04 fair Exp $ */ /* @@ -39,6 +39,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/proc.h> #include <sys/device.h> #include <sys/extent.h> #include <sys/mbuf.h> diff --git a/sys/arch/vax/include/atomic.h b/sys/arch/vax/include/atomic.h index 3cf2f7ebed0..4166463158e 100644 --- a/sys/arch/vax/include/atomic.h +++ b/sys/arch/vax/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.3 2007/04/05 17:33:50 miod Exp $ */ +/* $OpenBSD: atomic.h,v 1.4 2010/04/21 03:03:26 deraadt Exp $ */ /* Public Domain */ @@ -8,6 +8,7 @@ #if defined(_KERNEL) #include <machine/mtpr.h> +#include <machine/intr.h> static __inline void atomic_setbits_int(__volatile unsigned int *uip, unsigned int v) diff --git a/sys/arch/vax/include/lock.h b/sys/arch/vax/include/lock.h index 4620717f3ee..364b430f0ff 100644 --- a/sys/arch/vax/include/lock.h +++ b/sys/arch/vax/include/lock.h @@ -1,10 +1,12 @@ -/* $OpenBSD: lock.h,v 1.1 2007/05/01 18:56:31 miod Exp $ */ +/* $OpenBSD: lock.h,v 1.2 2010/04/21 03:03:26 deraadt Exp $ */ /* public domain */ #ifndef _VAX_LOCK_H_ #define _VAX_LOCK_H_ +#include <machine/atomic.h> + typedef volatile u_int __cpu_simple_lock_t; #define __SIMPLELOCK_LOCKED 1 |