Module Name: src
Committed By: riastradh
Date: Fri Nov 29 20:05:29 UTC 2019
Modified Files:
src/sys/arch/hppa/include: lock.h mutex.h
Log Message:
Nix mb_* on hppa.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/include/lock.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/include/mutex.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/include/lock.h
diff -u src/sys/arch/hppa/include/lock.h:1.21 src/sys/arch/hppa/include/lock.h:1.22
--- src/sys/arch/hppa/include/lock.h:1.21 Tue Apr 16 12:25:17 2019
+++ src/sys/arch/hppa/include/lock.h Fri Nov 29 20:05:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.21 2019/04/16 12:25:17 skrll Exp $ */
+/* $NetBSD: lock.h,v 1.22 2019/11/29 20:05:29 riastradh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -141,22 +141,4 @@ __cpu_simple_lock_clear(__cpu_simple_loc
*__aptr = __SIMPLELOCK_RAW_UNLOCKED;
}
-static __inline void
-mb_read(void)
-{
- __sync();
-}
-
-static __inline void
-mb_write(void)
-{
- __sync();
-}
-
-static __inline void
-mb_memory(void)
-{
- __sync();
-}
-
#endif /* _HPPA_LOCK_H_ */
Index: src/sys/arch/hppa/include/mutex.h
diff -u src/sys/arch/hppa/include/mutex.h:1.13 src/sys/arch/hppa/include/mutex.h:1.14
--- src/sys/arch/hppa/include/mutex.h:1.13 Wed Oct 4 23:04:42 2017
+++ src/sys/arch/hppa/include/mutex.h Fri Nov 29 20:05:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.13 2017/10/04 23:04:42 christos Exp $ */
+/* $NetBSD: mutex.h,v 1.14 2019/11/29 20:05:29 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -99,9 +99,9 @@ MUTEX_OWNED(uintptr_t owner)
static inline int
MUTEX_SET_WAITERS(struct kmutex *mtx, uintptr_t owner)
{
- mb_write();
+ __sync(); /* formerly mb_read */
mtx->mtx_waiters = 1;
- mb_memory();
+ __sync(); /* formerly mb_memory */
return mtx->mtx_owner != MUTEX_ADAPTIVE_UNOWNED;
}
