Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:02:47 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/asm: barrier.h
src/sys/external/bsd/drm2/include/linux: atomic.h
Log Message:
Move smp_mb_before/after_atomic from linux/atomic.h to asm/barrier.h.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/common/include/asm/barrier.h
cvs rdiff -u -r1.32 -r1.33 src/sys/external/bsd/drm2/include/linux/atomic.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/external/bsd/common/include/asm/barrier.h
diff -u src/sys/external/bsd/common/include/asm/barrier.h:1.6 src/sys/external/bsd/common/include/asm/barrier.h:1.7
--- src/sys/external/bsd/common/include/asm/barrier.h:1.6 Sun Dec 19 10:56:58 2021
+++ src/sys/external/bsd/common/include/asm/barrier.h Sun Dec 19 11:02:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: barrier.h,v 1.6 2021/12/19 10:56:58 riastradh Exp $ */
+/* $NetBSD: barrier.h,v 1.7 2021/12/19 11:02:46 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -70,4 +70,12 @@
# define smp_read_barrier_depends() do {} while (0)
#endif
+#if defined(MULTIPROCESSOR) && !defined(__HAVE_ATOMIC_AS_MEMBAR)
+# define smp_mb__before_atomic() membar_exit()
+# define smp_mb__after_atomic() membar_enter()
+#else
+# define smp_mb__before_atomic() __insn_barrier()
+# define smp_mb__after_atomic() __insn_barrier()
+#endif
+
#endif /* _ASM_BARRIER_H_ */
Index: src/sys/external/bsd/drm2/include/linux/atomic.h
diff -u src/sys/external/bsd/drm2/include/linux/atomic.h:1.32 src/sys/external/bsd/drm2/include/linux/atomic.h:1.33
--- src/sys/external/bsd/drm2/include/linux/atomic.h:1.32 Sun Dec 19 11:02:38 2021
+++ src/sys/external/bsd/drm2/include/linux/atomic.h Sun Dec 19 11:02:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.32 2021/12/19 11:02:38 riastradh Exp $ */
+/* $NetBSD: atomic.h,v 1.33 2021/12/19 11:02:46 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,14 +38,6 @@
#include <asm/barrier.h>
-#if defined(MULTIPROCESSOR) && !defined(__HAVE_ATOMIC_AS_MEMBAR)
-# define smp_mb__before_atomic() membar_exit()
-# define smp_mb__after_atomic() membar_enter()
-#else
-# define smp_mb__before_atomic() __insn_barrier()
-# define smp_mb__after_atomic() __insn_barrier()
-#endif
-
#define xchg(P, V) \
(sizeof(*(P)) == 4 ? atomic_swap_32((volatile uint32_t *)P, V) \
: sizeof(*(P)) == 8 ? atomic_swap_64((volatile uint64_t *)P, V) \
