Module Name: src
Committed By: riastradh
Date: Fri Nov 29 20:05:08 UTC 2019
Modified Files:
src/sys/arch/alpha/include: lock.h mutex.h
Log Message:
Nix mb_* on alpha.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/include/lock.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/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/alpha/include/lock.h
diff -u src/sys/arch/alpha/include/lock.h:1.29 src/sys/arch/alpha/include/lock.h:1.30
--- src/sys/arch/alpha/include/lock.h:1.29 Sun Sep 17 00:01:07 2017
+++ src/sys/arch/alpha/include/lock.h Fri Nov 29 20:05:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.29 2017/09/17 00:01:07 christos Exp $ */
+/* $NetBSD: lock.h,v 1.30 2019/11/29 20:05:07 riastradh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -174,23 +174,4 @@ do { \
#define SPINLOCK_BACKOFF_HOOK (void)nullop((void *)0)
#endif /* MULTIPROCESSOR */
-static __inline void
-mb_read(void)
-{
- __asm __volatile("mb" : : : "memory");
-}
-
-static __inline void
-mb_write(void)
-{
- /* XXX wmb */
- __asm __volatile("mb" : : : "memory");
-}
-
-static __inline void
-mb_memory(void)
-{
- __asm __volatile("mb" : : : "memory");
-}
-
#endif /* _ALPHA_LOCK_H_ */
Index: src/sys/arch/alpha/include/mutex.h
diff -u src/sys/arch/alpha/include/mutex.h:1.4 src/sys/arch/alpha/include/mutex.h:1.5
--- src/sys/arch/alpha/include/mutex.h:1.4 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/include/mutex.h Fri Nov 29 20:05:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.4 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.5 2019/11/29 20:05:07 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -60,8 +60,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) __asm __volatile("mb" : : : "memory")
+#define MUTEX_GIVE(mtx) __asm __volatile("mb" : : : "memory")
#define MUTEX_CAS(p, o, n) _lock_cas((p), (o), (n))
