Module Name: src
Committed By: riastradh
Date: Fri Nov 29 20:05:49 UTC 2019
Modified Files:
src/sys/arch/m68k/include: lock.h mutex.h
Log Message:
Nix mb_* on m68k.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/include/lock.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/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/m68k/include/lock.h
diff -u src/sys/arch/m68k/include/lock.h:1.15 src/sys/arch/m68k/include/lock.h:1.16
--- src/sys/arch/m68k/include/lock.h:1.15 Sun Sep 17 00:01:07 2017
+++ src/sys/arch/m68k/include/lock.h Fri Nov 29 20:05:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.15 2017/09/17 00:01:07 christos Exp $ */
+/* $NetBSD: lock.h,v 1.16 2019/11/29 20:05:49 riastradh Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,22 +101,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t
*alp = __SIMPLELOCK_UNLOCKED;
}
-static __inline void
-mb_read(void)
-{
- __asm volatile("" : : : "memory");
-}
-
-static __inline void
-mb_write(void)
-{
- __asm volatile("" : : : "memory");
-}
-
-static __inline void
-mb_memory(void)
-{
- __asm volatile("" : : : "memory");
-}
-
#endif /* _M68K_LOCK_H_ */
Index: src/sys/arch/m68k/include/mutex.h
diff -u src/sys/arch/m68k/include/mutex.h:1.7 src/sys/arch/m68k/include/mutex.h:1.8
--- src/sys/arch/m68k/include/mutex.h:1.7 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/m68k/include/mutex.h Fri Nov 29 20:05:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.7 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.8 2019/11/29 20:05:49 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -62,8 +62,8 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
#define __HAVE_MUTEX_STUBS 1
-#define MUTEX_RECEIVE(mtx) mb_read()
-#define MUTEX_GIVE(mtx) mb_memory()
+#define MUTEX_RECEIVE(mtx) __insn_barrier()
+#define MUTEX_GIVE(mtx) __insn_barrier()
#define MUTEX_CAS(p, o, n) (atomic_cas_uint((p), (o), (n)) == (o))
