diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-21 03:03:27 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-21 03:03:27 +0000 |
commit | ca48e4ece50b04c33f4709c41bf96a35905d1f6b (patch) | |
tree | 0bad76df874a74978118183a2528059491d02744 /sys/arch/sparc | |
parent | 9497af87f5b565b6e916fe63f0f1813de69367ec (diff) |
more cleanup to cope with the change that tries to make proc.h not act
like it is everything.h
ok tedu
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r-- | sys/arch/sparc/dev/if_ie.c | 3 | ||||
-rw-r--r-- | sys/arch/sparc/include/atomic.h | 4 | ||||
-rw-r--r-- | sys/arch/sparc/include/lock.h | 4 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 3 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/iommu.c | 3 |
5 files changed, 12 insertions, 5 deletions
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> |