svn commit: r354634 - in stable/12/sys: cddl/compat/opensolaris/kern cddl/compat/opensolaris/sys cddl/contrib/opensolaris/common/atomic/aarch64 cddl/contrib/opensolaris/common/atomic/amd64 cddl/con...
Andriy Gapon
avg at FreeBSD.org
Tue Nov 12 09:54:51 UTC 2019
Author: avg
Date: Tue Nov 12 09:54:48 2019
New Revision: 354634
URL: https://svnweb.freebsd.org/changeset/base/354634
Log:
MFC r353381: emulate illumos membar_producer with atomic_thread_fence_rel
Deleted:
stable/12/sys/cddl/contrib/opensolaris/common/atomic/aarch64/opensolaris_atomic.S
stable/12/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S
stable/12/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S
stable/12/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S
Modified:
stable/12/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
stable/12/sys/cddl/compat/opensolaris/sys/atomic.h
stable/12/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S
stable/12/sys/conf/files.amd64
stable/12/sys/conf/files.arm
stable/12/sys/conf/files.arm64
stable/12/sys/conf/files.powerpc
stable/12/sys/conf/files.riscv
stable/12/sys/conf/files.sparc64
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
==============================================================================
--- stable/12/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c Tue Nov 12 09:54:48 2019 (r354634)
@@ -120,9 +120,3 @@ atomic_cas_64(volatile uint64_t *target, uint64_t cmp,
return (oldval);
}
#endif
-
-void
-membar_producer(void)
-{
- /* nothing */
-}
Modified: stable/12/sys/cddl/compat/opensolaris/sys/atomic.h
==============================================================================
--- stable/12/sys/cddl/compat/opensolaris/sys/atomic.h Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/cddl/compat/opensolaris/sys/atomic.h Tue Nov 12 09:54:48 2019 (r354634)
@@ -52,7 +52,7 @@ extern uint64_t atomic_cas_64(volatile uint64_t *targe
uint64_t newval);
#endif
-extern void membar_producer(void);
+#define membar_producer atomic_thread_fence_rel
static __inline uint32_t
atomic_add_32_nv(volatile uint32_t *target, int32_t delta)
Modified: stable/12/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S
==============================================================================
--- stable/12/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S Tue Nov 12 09:54:48 2019 (r354634)
@@ -131,9 +131,3 @@
popl %esi
ret
SET_SIZE(atomic_load_64)
-
- ENTRY(membar_producer)
- lock
- xorl $0, (%esp)
- ret
- SET_SIZE(membar_producer)
Modified: stable/12/sys/conf/files.amd64
==============================================================================
--- stable/12/sys/conf/files.amd64 Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/conf/files.amd64 Tue Nov 12 09:54:48 2019 (r354634)
@@ -162,7 +162,6 @@ amd64/amd64/vm_machdep.c standard
amd64/cloudabi32/cloudabi32_sysvec.c optional compat_cloudabi32
amd64/cloudabi64/cloudabi64_sysvec.c optional compat_cloudabi64
amd64/pci/pci_cfgreg.c optional pci
-cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S optional zfs | dtrace compile-with "${ZFS_S}"
cddl/dev/dtrace/amd64/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/amd64/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/x86/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
Modified: stable/12/sys/conf/files.arm
==============================================================================
--- stable/12/sys/conf/files.arm Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/conf/files.arm Tue Nov 12 09:54:48 2019 (r354634)
@@ -94,7 +94,7 @@ board_id.h standard \
compile-with "${AWK} -f $S/arm/conf/genboardid.awk $S/arm/conf/mach-types > board_id.h" \
no-obj no-implicit-rule before-depend \
clean "board_id.h"
-cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs | dtrace compile-with "${CDDL_C}"
+cddl/compat/opensolaris/kern/opensolaris_atomic.c optional !armv7 !armv6 zfs | !armv7 !armv6 dtrace compile-with "${CDDL_C}"
cddl/dev/dtrace/arm/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/arm/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/arm/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
Modified: stable/12/sys/conf/files.arm64
==============================================================================
--- stable/12/sys/conf/files.arm64 Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/conf/files.arm64 Tue Nov 12 09:54:48 2019 (r354634)
@@ -266,7 +266,6 @@ libkern/flsll.c standard
libkern/memcmp.c standard
libkern/memset.c standard
libkern/arm64/crc32c_armv8.S standard
-cddl/contrib/opensolaris/common/atomic/aarch64/opensolaris_atomic.S optional zfs | dtrace compile-with "${CDDL_C}"
cddl/dev/dtrace/aarch64/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/aarch64/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/aarch64/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
Modified: stable/12/sys/conf/files.powerpc
==============================================================================
--- stable/12/sys/conf/files.powerpc Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/conf/files.powerpc Tue Nov 12 09:54:48 2019 (r354634)
@@ -16,7 +16,6 @@ font.h optional sc \
#
# There is only an asm version on ppc64.
cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc | dtrace powerpc | zfs powerpcspe | dtrace powerpcspe compile-with "${ZFS_C}"
-cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S optional zfs powerpc64 | dtrace powerpc64 compile-with "${ZFS_S}"
cddl/dev/dtrace/powerpc/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/powerpc/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/powerpc/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
Modified: stable/12/sys/conf/files.riscv
==============================================================================
--- stable/12/sys/conf/files.riscv Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/conf/files.riscv Tue Nov 12 09:54:48 2019 (r354634)
@@ -1,5 +1,4 @@
# $FreeBSD$
-cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs | dtrace compile-with "${CDDL_C}"
cddl/dev/dtrace/riscv/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/riscv/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/riscv/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
Modified: stable/12/sys/conf/files.sparc64
==============================================================================
--- stable/12/sys/conf/files.sparc64 Tue Nov 12 01:03:08 2019 (r354633)
+++ stable/12/sys/conf/files.sparc64 Tue Nov 12 09:54:48 2019 (r354634)
@@ -22,7 +22,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
-cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}"
crypto/blowfish/bf_enc.c optional crypto | ipsec | ipsec_support
crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
dev/atkbdc/atkbd.c optional atkbd atkbdc
More information about the svn-src-all
mailing list