summaryrefslogtreecommitdiff
path: root/sys/arch/arm/include
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-21 03:03:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-21 03:03:27 +0000
commitca48e4ece50b04c33f4709c41bf96a35905d1f6b (patch)
tree0bad76df874a74978118183a2528059491d02744 /sys/arch/arm/include
parent9497af87f5b565b6e916fe63f0f1813de69367ec (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/arm/include')
-rw-r--r--sys/arch/arm/include/atomic.h5
-rw-r--r--sys/arch/arm/include/lock.h4
2 files changed, 7 insertions, 2 deletions
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