Module Name: src
Committed By: riastradh
Date: Fri Nov 29 22:55:34 UTC 2019
Modified Files:
src/sys/arch/alpha/include: mutex.h
src/sys/arch/arm/include: mutex.h
src/sys/arch/ia64/include: mutex.h
src/sys/arch/m68k/include: mutex.h
src/sys/arch/mips/include: mutex.h
src/sys/arch/or1k/include: mutex.h
src/sys/arch/powerpc/include: mutex.h
src/sys/arch/riscv/include: mutex.h
src/sys/arch/sh3/include: mutex.h
src/sys/arch/sparc/include: mutex.h
src/sys/arch/sparc64/include: mutex.h
src/sys/arch/usermode/include: mutex.h
src/sys/arch/vax/include: mutex.h
src/sys/arch/x86/include: mutex.h
Log Message:
Nix now-unused definitions of MUTEX_GIVE/MUTEX_RECEIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/include/mutex.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/include/mutex.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/include/mutex.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/include/mutex.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/include/mutex.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/mutex.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/mutex.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/mutex.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sh3/include/mutex.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/include/mutex.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/include/mutex.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/include/mutex.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/include/mutex.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/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/mutex.h
diff -u src/sys/arch/alpha/include/mutex.h:1.5 src/sys/arch/alpha/include/mutex.h:1.6
--- src/sys/arch/alpha/include/mutex.h:1.5 Fri Nov 29 20:05:07 2019
+++ src/sys/arch/alpha/include/mutex.h Fri Nov 29 22:55:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.5 2019/11/29 20:05:07 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.6 2019/11/29 22:55:33 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -60,9 +60,6 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
#define __HAVE_MUTEX_STUBS 1
-#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))
int _lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
Index: src/sys/arch/arm/include/mutex.h
diff -u src/sys/arch/arm/include/mutex.h:1.20 src/sys/arch/arm/include/mutex.h:1.21
--- src/sys/arch/arm/include/mutex.h:1.20 Wed Feb 25 13:52:42 2015
+++ src/sys/arch/arm/include/mutex.h Fri Nov 29 22:55:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.20 2015/02/25 13:52:42 joerg Exp $ */
+/* $NetBSD: mutex.h,v 1.21 2019/11/29 22:55:33 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -84,30 +84,6 @@ struct kmutex {
#endif
#define __HAVE_SIMPLE_MUTEXES 1
-/*
- * MUTEX_{GIVE,RECEIVE}: no memory barrier is required in the UP case;
- * we're synchronizing against interrupts, not multiple processors.
- */
-#ifdef MULTIPROCESSOR
-#ifdef _ARM_ARCH_7
-#define MUTEX_RECEIVE(mtx) __asm __volatile("dmb" ::: "memory")
-#else
-#define MUTEX_RECEIVE(mtx) membar_consumer()
-#endif
-#else
-#define MUTEX_RECEIVE(mtx) /* nothing */
-#endif
-
-#ifdef MULTIPROCESSOR
-#ifdef _ARM_ARCH_7
-#define MUTEX_GIVE(mtx) __asm __volatile("dsb" ::: "memory")
-#else
-#define MUTEX_GIVE(mtx) membar_producer()
-#endif
-#else
-#define MUTEX_GIVE(mtx) /* nothing */
-#endif
-
#define MUTEX_CAS(p, o, n) \
(atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
#ifdef MULTIPROCESSOR
Index: src/sys/arch/ia64/include/mutex.h
diff -u src/sys/arch/ia64/include/mutex.h:1.4 src/sys/arch/ia64/include/mutex.h:1.5
--- src/sys/arch/ia64/include/mutex.h:1.4 Mon Jul 20 04:41:37 2009
+++ src/sys/arch/ia64/include/mutex.h Fri Nov 29 22:55:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.4 2009/07/20 04:41:37 kiyohara Exp $ */
+/* $NetBSD: mutex.h,v 1.5 2019/11/29 22:55:33 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -56,16 +56,6 @@ struct kmutex {
*/
#define __HAVE_SIMPLE_MUTEXES 1
-/*
- * MUTEX_RECEIVE: no memory barrier required, atomic_cas implies a load fence.
- */
-#define MUTEX_RECEIVE(mtx) /* nothing */
-
-/*
- * MUTEX_GIVE: no memory barrier required, as _lock_cas() will take care of it.
- */
-#define MUTEX_GIVE(mtx) /* nothing */
-
#define MUTEX_CAS(ptr, old, new) \
(atomic_cas_ulong((volatile unsigned long *)(ptr), (old), (new)) == (old))
Index: src/sys/arch/m68k/include/mutex.h
diff -u src/sys/arch/m68k/include/mutex.h:1.8 src/sys/arch/m68k/include/mutex.h:1.9
--- src/sys/arch/m68k/include/mutex.h:1.8 Fri Nov 29 20:05:49 2019
+++ src/sys/arch/m68k/include/mutex.h Fri Nov 29 22:55:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.8 2019/11/29 20:05:49 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.9 2019/11/29 22:55:33 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -62,9 +62,6 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
#define __HAVE_MUTEX_STUBS 1
-#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))
#endif /* __MUTEX_PRIVATE */
Index: src/sys/arch/mips/include/mutex.h
diff -u src/sys/arch/mips/include/mutex.h:1.7 src/sys/arch/mips/include/mutex.h:1.8
--- src/sys/arch/mips/include/mutex.h:1.7 Sun Feb 20 07:45:47 2011
+++ src/sys/arch/mips/include/mutex.h Fri Nov 29 22:55:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.7 2011/02/20 07:45:47 matt Exp $ */
+/* $NetBSD: mutex.h,v 1.8 2019/11/29 22:55:33 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -55,9 +55,6 @@ struct kmutex {
#define __HAVE_MUTEX_STUBS 1
#define __HAVE_SPIN_MUTEX_STUBS 1
-#define MUTEX_RECEIVE(mtx) membar_enter()
-#define MUTEX_GIVE(mtx) membar_exit()
-
#define MUTEX_CAS(p, o, n) \
(atomic_cas_ulong((volatile u_long *)(p), (o), (n)) == (o))
Index: src/sys/arch/or1k/include/mutex.h
diff -u src/sys/arch/or1k/include/mutex.h:1.1 src/sys/arch/or1k/include/mutex.h:1.2
--- src/sys/arch/or1k/include/mutex.h:1.1 Wed Sep 3 19:34:26 2014
+++ src/sys/arch/or1k/include/mutex.h Fri Nov 29 22:55:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+/* $NetBSD: mutex.h,v 1.2 2019/11/29 22:55:33 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -70,25 +70,6 @@ struct kmutex {
#endif
#define __HAVE_SIMPLE_MUTEXES 1
-/*
- * MUTEX_RECEIVE: no memory barrier required; we're synchronizing against
- * interrupts, not multiple processors.
- */
-#ifdef MULTIPROCESSOR
-#define MUTEX_RECEIVE(mtx) membar_consumer()
-#else
-#define MUTEX_RECEIVE(mtx) /* nothing */
-#endif
-
-/*
- * MUTEX_GIVE: no memory barrier required; same reason.
- */
-#ifdef MULTIPROCESSOR
-#define MUTEX_GIVE(mtx) membar_producer()
-#else
-#define MUTEX_GIVE(mtx) /* nothing */
-#endif
-
#define MUTEX_CAS(p, o, n) \
(atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
Index: src/sys/arch/powerpc/include/mutex.h
diff -u src/sys/arch/powerpc/include/mutex.h:1.5 src/sys/arch/powerpc/include/mutex.h:1.6
--- src/sys/arch/powerpc/include/mutex.h:1.5 Fri Nov 29 20:05:59 2019
+++ src/sys/arch/powerpc/include/mutex.h Fri Nov 29 22:55:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.5 2019/11/29 20:05:59 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.6 2019/11/29 22:55:34 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -61,9 +61,6 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
#define __HAVE_MUTEX_STUBS 1
-#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))
int _lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
Index: src/sys/arch/riscv/include/mutex.h
diff -u src/sys/arch/riscv/include/mutex.h:1.2 src/sys/arch/riscv/include/mutex.h:1.3
--- src/sys/arch/riscv/include/mutex.h:1.2 Sat Jun 1 12:42:28 2019
+++ src/sys/arch/riscv/include/mutex.h Fri Nov 29 22:55:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.2 2019/06/01 12:42:28 maxv Exp $ */
+/* $NetBSD: mutex.h,v 1.3 2019/11/29 22:55:34 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -113,25 +113,6 @@ riscv_mutex_spinbit_lock_unlock(kmutex_t
#endif
#define __HAVE_SIMPLE_MUTEXES 1
-/*
- * MUTEX_RECEIVE: no memory barrier required; we're synchronizing against
- * interrupts, not multiple processors.
- */
-#ifdef MULTIPROCESSOR
-#define MUTEX_RECEIVE(mtx) membar_consumer()
-#else
-#define MUTEX_RECEIVE(mtx) /* nothing */
-#endif
-
-/*
- * MUTEX_GIVE: no memory barrier required; same reason.
- */
-#ifdef MULTIPROCESSOR
-#define MUTEX_GIVE(mtx) membar_producer()
-#else
-#define MUTEX_GIVE(mtx) /* nothing */
-#endif
-
#define MUTEX_CAS(p, o, n) \
(atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
Index: src/sys/arch/sh3/include/mutex.h
diff -u src/sys/arch/sh3/include/mutex.h:1.9 src/sys/arch/sh3/include/mutex.h:1.10
--- src/sys/arch/sh3/include/mutex.h:1.9 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sh3/include/mutex.h Fri Nov 29 22:55:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.9 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.10 2019/11/29 22:55:34 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -62,17 +62,6 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
#define __HAVE_MUTEX_STUBS 1
-/*
- * MUTEX_RECEIVE: no memory barrier required; we're synchronizing against
- * interrupts, not multiple processors.
- */
-#define MUTEX_RECEIVE(mtx) /* nothing */
-
-/*
- * MUTEX_GIVE: no memory barrier required; same reason.
- */
-#define MUTEX_GIVE(mtx) /* nothing */
-
uintptr_t _lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
#define MUTEX_CAS(p, o, n) (_lock_cas((p), (o), (n)) == (o))
Index: src/sys/arch/sparc/include/mutex.h
diff -u src/sys/arch/sparc/include/mutex.h:1.10 src/sys/arch/sparc/include/mutex.h:1.11
--- src/sys/arch/sparc/include/mutex.h:1.10 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/include/mutex.h Fri Nov 29 22:55:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.10 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.11 2019/11/29 22:55:34 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
@@ -58,9 +58,6 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
-#define MUTEX_RECEIVE(mtx) /* nothing */
-#define MUTEX_GIVE(mtx) /* nothing */
-
#define MUTEX_CAS(p, o, n) \
(_atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
Index: src/sys/arch/sparc64/include/mutex.h
diff -u src/sys/arch/sparc64/include/mutex.h:1.5 src/sys/arch/sparc64/include/mutex.h:1.6
--- src/sys/arch/sparc64/include/mutex.h:1.5 Fri Nov 29 20:06:34 2019
+++ src/sys/arch/sparc64/include/mutex.h Fri Nov 29 22:55:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.5 2019/11/29 20:06:34 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.6 2019/11/29 22:55:34 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -55,17 +55,6 @@ struct kmutex {
#define __HAVE_MUTEX_STUBS 1
#define __HAVE_SIMPLE_MUTEXES 1
-/*
- * XXX Should this be LoadLoad|LoadStore, or does the assumption of a
- * preceding atomic r/m/w operation obviate the need for that?
- */
-#define MUTEX_RECEIVE(mtx) __asm __volatile("membar #LoadLoad" : : : "memory")
-
-/*
- * MUTEX_GIVE: no memory barrier required, as _lock_cas() will take care of it.
- */
-#define MUTEX_GIVE(mtx) __insn_barrier()
-
#define MUTEX_CAS(p, o, n) _lock_cas((p), (o), (n))
int _lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
Index: src/sys/arch/usermode/include/mutex.h
diff -u src/sys/arch/usermode/include/mutex.h:1.3 src/sys/arch/usermode/include/mutex.h:1.4
--- src/sys/arch/usermode/include/mutex.h:1.3 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/usermode/include/mutex.h Fri Nov 29 22:55:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.3 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.4 2019/11/29 22:55:34 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
@@ -54,16 +54,6 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
-/*
- * MUTEX_RECEIVE: no memory barrier required, as 'ret' implies a load fence.
- */
-#define MUTEX_RECEIVE(mtx) /* nothing */
-
-/*
- * MUTEX_GIVE: no memory barrier required, as _lock_cas() will take care of it.
- */
-#define MUTEX_GIVE(mtx) /* nothing */
-
#define MUTEX_CAS(p, o, n) \
(_atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
Index: src/sys/arch/vax/include/mutex.h
diff -u src/sys/arch/vax/include/mutex.h:1.14 src/sys/arch/vax/include/mutex.h:1.15
--- src/sys/arch/vax/include/mutex.h:1.14 Thu Aug 14 11:28:13 2014
+++ src/sys/arch/vax/include/mutex.h Fri Nov 29 22:55:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.14 2014/08/14 11:28:13 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.15 2019/11/29 22:55:34 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -71,17 +71,6 @@ struct kmutex {
#define __HAVE_SPIN_MUTEX_STUBS 1
#define __HAVE_SIMPLE_MUTEXES 1
-/*
- * MUTEX_RECEIVE: no memory barrier required; we're synchronizing against
- * interrupts, not multiple processors.
- */
-#define MUTEX_RECEIVE(mtx) /* nothing */
-
-/*
- * MUTEX_GIVE: no memory barrier required; same reason.
- */
-#define MUTEX_GIVE(mtx) /* nothing */
-
#define MUTEX_CAS(p, o, n) (atomic_cas_ulong((p), (o), (n)) == (o))
#endif /* __MUTEX_PRIVATE */
Index: src/sys/arch/x86/include/mutex.h
diff -u src/sys/arch/x86/include/mutex.h:1.6 src/sys/arch/x86/include/mutex.h:1.7
--- src/sys/arch/x86/include/mutex.h:1.6 Fri Apr 24 17:49:51 2009
+++ src/sys/arch/x86/include/mutex.h Fri Nov 29 22:55:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.6 2009/04/24 17:49:51 ad Exp $ */
+/* $NetBSD: mutex.h,v 1.7 2019/11/29 22:55:34 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2009 The NetBSD Foundation, Inc.
@@ -56,19 +56,6 @@ struct kmutex {
#define __HAVE_SPIN_MUTEX_STUBS 1
#define __HAVE_SIMPLE_MUTEXES 1
-/*
- * MUTEX_RECEIVE: technically, no memory barrier is required
- * as 'ret' implies a load fence. However we need this to
- * handle a bug with some Opteron revisions. See patch.c,
- * lock_stubs.S.
- */
-#define MUTEX_RECEIVE(mtx) membar_consumer()
-
-/*
- * MUTEX_GIVE: no memory barrier required, as _lock_cas() will take care of it.
- */
-#define MUTEX_GIVE(mtx) /* nothing */
-
#define MUTEX_CAS(p, o, n) \
(_atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
