summaryrefslogtreecommitdiff
path: root/sys/arch/hppa/include
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2010-07-01 03:38:51 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2010-07-01 03:38:51 +0000
commitd673d66bf73bd6d731ee0d975d1def3dafe8b8d2 (patch)
treeb0509657ffd30c6931a27f168f9ba875206076ca /sys/arch/hppa/include
parentef76f436407d7a730766f3dcbf3c8c25b0369a45 (diff)
Include atomic.h via lock.h like other architectures do.
ok kettenis@
Diffstat (limited to 'sys/arch/hppa/include')
-rw-r--r--sys/arch/hppa/include/intr.h4
-rw-r--r--sys/arch/hppa/include/lock.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index aa7ab3b13fd..bb53e635bc8 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.32 2010/06/08 12:33:30 jsing Exp $ */
+/* $OpenBSD: intr.h,v 1.33 2010/07/01 03:38:50 jsing Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -63,8 +63,6 @@
#if !defined(_LOCORE) && defined(_KERNEL)
-#include <machine/atomic.h>
-
extern volatile u_long imask[NIPL];
#ifdef DIAGNOSTIC
diff --git a/sys/arch/hppa/include/lock.h b/sys/arch/hppa/include/lock.h
index 9df47129a62..5120425631a 100644
--- a/sys/arch/hppa/include/lock.h
+++ b/sys/arch/hppa/include/lock.h
@@ -1,10 +1,12 @@
-/* $OpenBSD: lock.h,v 1.1 2007/05/01 18:56:30 miod Exp $ */
+/* $OpenBSD: lock.h,v 1.2 2010/07/01 03:38:50 jsing Exp $ */
/* public domain */
#ifndef _HPPA_LOCK_H_
#define _HPPA_LOCK_H_
+#include <machine/atomic.h>
+
typedef volatile u_int __cpu_simple_lock_t __attribute__((__aligned__(16)));
#define __SIMPLELOCK_LOCKED 0