summaryrefslogtreecommitdiff
path: root/sys/arch/sh/include
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2013-06-01 20:47:41 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2013-06-01 20:47:41 +0000
commit2fbfcceb960fb807aa9b99a0597dedde67f9d6f8 (patch)
tree8898346871e5f91b8f2a10e9d30e44dbbf668349 /sys/arch/sh/include
parent751ab61a6dd86c9f4339695dcb646ee54892c289 (diff)
cleanup and consolidate the spinlock_lock (what a name!) code.
it's now atomic_lock to better reflect its usage, and librthread now features a new spinlock that's really a ticket lock. thrlseep can handle both types of lock via a flag in the clock arg. (temp back compat hack) remove some old stuff that's accumulated along the way and no longer used. some feedback from dlg, who is concerned with all things ticket lock. (you need to boot a new kernel before installing librthread)
Diffstat (limited to 'sys/arch/sh/include')
-rw-r--r--sys/arch/sh/include/spinlock.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/sh/include/spinlock.h b/sys/arch/sh/include/spinlock.h
index 5d8516aab3e..f35a7effd9d 100644
--- a/sys/arch/sh/include/spinlock.h
+++ b/sys/arch/sh/include/spinlock.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: spinlock.h,v 1.3 2008/06/26 05:42:13 ray Exp $ */
+/* $OpenBSD: spinlock.h,v 1.4 2013/06/01 20:47:40 tedu Exp $ */
/* $NetBSD: lock.h,v 1.10 2006/01/03 01:29:46 uwe Exp $ */
/*-
@@ -37,9 +37,13 @@
#ifndef _SH_SPINLOCK_H_
#define _SH_SPINLOCK_H_
-typedef u_int8_t _spinlock_lock_t;
+typedef u_int8_t _atomic_lock_t;
-#define _SPINLOCK_LOCKED 0x80
-#define _SPINLOCK_UNLOCKED 0x00
+#ifndef _KERNEL
+int _atomic_lock(volatile _atomic_lock_t *);
+#endif
+
+#define _ATOMIC_LOCK_LOCKED 0x80
+#define _ATOMIC_LOCK_UNLOCKED 0x00
#endif /* !_SH_SPINLOCK_H_ */