Module Name: src
Committed By: riastradh
Date: Fri Nov 29 20:05:59 UTC 2019
Modified Files:
src/sys/arch/powerpc/include: lock.h mutex.h
Log Message:
Nix mb_* on powerpc.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/lock.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/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/powerpc/include/lock.h
diff -u src/sys/arch/powerpc/include/lock.h:1.13 src/sys/arch/powerpc/include/lock.h:1.14
--- src/sys/arch/powerpc/include/lock.h:1.13 Sun Sep 17 00:01:08 2017
+++ src/sys/arch/powerpc/include/lock.h Fri Nov 29 20:05:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.13 2017/09/17 00:01:08 christos Exp $ */
+/* $NetBSD: lock.h,v 1.14 2019/11/29 20:05:59 riastradh Exp $ */
/*-
* Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
@@ -120,22 +120,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t
*alp = __SIMPLELOCK_UNLOCKED;
}
-static __inline void
-mb_read(void)
-{
- __asm volatile ("isync" ::: "memory");
-}
-
-static __inline void
-mb_write(void)
-{
- __asm volatile ("sync" ::: "memory");
-}
-
-static __inline void
-mb_memory(void)
-{
- __asm volatile ("sync" ::: "memory");
-}
-
#endif /* _POWERPC_LOCK_H_ */
Index: src/sys/arch/powerpc/include/mutex.h
diff -u src/sys/arch/powerpc/include/mutex.h:1.4 src/sys/arch/powerpc/include/mutex.h:1.5
--- src/sys/arch/powerpc/include/mutex.h:1.4 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/include/mutex.h Fri Nov 29 20:05:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.4 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.5 2019/11/29 20:05:59 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -61,8 +61,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("isync" ::: "memory")
+#define MUTEX_GIVE(mtx) __asm __volatile("sync" ::: "memory")
#define MUTEX_CAS(p, o, n) _lock_cas((p), (o), (n))
