Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:40:54 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: atomic.h
Log Message:
Nix memory barriers that were nixed upstream. Add smp_mb__after_atomic.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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/drm2/include/linux/atomic.h
diff -u src/sys/external/bsd/drm2/include/linux/atomic.h:1.11 src/sys/external/bsd/drm2/include/linux/atomic.h:1.12
--- src/sys/external/bsd/drm2/include/linux/atomic.h:1.11 Mon Aug 27 13:40:41 2018
+++ src/sys/external/bsd/drm2/include/linux/atomic.h Mon Aug 27 13:40:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.11 2018/08/27 13:40:41 riastradh Exp $ */
+/* $NetBSD: atomic.h,v 1.12 2018/08/27 13:40:53 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -276,16 +276,10 @@ test_and_change_bit(unsigned int bit, vo
* before/after memory barriers is not consistent throughout Linux.
*/
# define smp_mb__before_atomic() membar_sync()
-# define smp_mb__before_atomic_inc() membar_sync()
-# define smp_mb__after_atomic_inc() membar_sync()
-# define smp_mb__before_atomic_dec() membar_sync()
-# define smp_mb__after_atomic_dec() membar_sync()
+# define smp_mb__after_atomic() membar_sync()
#else
# define smp_mb__before_atomic() __insn_barrier()
-# define smp_mb__before_atomic_inc() __insn_barrier()
-# define smp_mb__after_atomic_inc() __insn_barrier()
-# define smp_mb__before_atomic_dec() __insn_barrier()
-# define smp_mb__after_atomic_dec() __insn_barrier()
+# define smp_mb__after_atomic() __insn_barrier()
#endif
#endif /* _LINUX_ATOMIC_H_ */
