aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>2000-09-29 16:51:33 +0000
committerDoug Rabson <dfr@FreeBSD.org>2000-09-29 16:51:33 +0000
commit3e90246a823941fc37827fa2e6e96e142118fa82 (patch)
treea7016e9a63a107534f44be2916abed403293d140
parentf6174366bf17893bb4be52560f436a6dcd8e2f12 (diff)
Notes
-rw-r--r--sys/ia64/ia64/mp_machdep.c8
-rw-r--r--sys/ia64/include/lock.h13
2 files changed, 12 insertions, 9 deletions
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 6dea3272b5c6d..ce673a11fef2d 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -136,7 +136,13 @@ s_lock(struct simplelock *lkp)
int
s_lock_try(struct simplelock *lkp)
{
- return 0; /* XXX needed? */
+ return 1; /* XXX needed? */
+}
+
+void
+s_unlock(struct simplelock *lkp)
+{
+ ia64_st_rel_32(&lkp->lock_data, 0);
}
/* Other stuff */
diff --git a/sys/ia64/include/lock.h b/sys/ia64/include/lock.h
index 189b9662f3e94..42dc6a8e5fce7 100644
--- a/sys/ia64/include/lock.h
+++ b/sys/ia64/include/lock.h
@@ -42,15 +42,12 @@ struct simplelock {
void s_lock_init __P((struct simplelock *));
void s_lock __P((struct simplelock *));
int s_lock_try __P((struct simplelock *));
+void s_unlock __P((struct simplelock *));
-/* inline simplelock functions */
-static __inline void
-s_unlock(struct simplelock *lkp)
-{
-#if 0 /* XXX */
- ia64_st_rel_32(&lkp->lock_data, 0);
-#endif
-}
+#define simple_lock_init(alp) s_lock_init(alp)
+#define simple_lock(alp) s_lock(alp)
+#define simple_lock_try(alp) s_lock_try(alp)
+#define simple_unlock(alp) s_unlock(alp)
#define COM_LOCK()
#define COM_UNLOCK()