diff options
| author | andre <andre@FreeBSD.org> | 2013-05-06 16:42:18 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2013-05-06 16:42:18 +0000 |
| commit | cc8c6e4d0185c640c9d03ed2804e3020ff84fed0 (patch) | |
| tree | bc5a2ce870d8be82a3e6edc11f23760b66ef0c33 /sys/kern | |
| parent | 1734db112abe08b1a5ac14f46a78473dc350eb64 (diff) | |
| download | FreeBSD-src-cc8c6e4d0185c640c9d03ed2804e3020ff84fed0.zip FreeBSD-src-cc8c6e4d0185c640c9d03ed2804e3020ff84fed0.tar.gz | |
Back out r249318, r249320 and r249327 due to a heisenbug most
likely related to a race condition in the ipi_hash_lock with
the exact cause currently unknown but under investigation.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 7986c4b..c9b48d3 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -240,14 +240,14 @@ SYSCTL_INT(_kern_ipc_zero_copy, OID_AUTO, send, CTLFLAG_RW, * accept_mtx locks down per-socket fields relating to accept queues. See * socketvar.h for an annotation of the protected fields of struct socket. */ -struct mtx_padalign accept_mtx; +struct mtx accept_mtx; MTX_SYSINIT(accept_mtx, &accept_mtx, "accept", MTX_DEF); /* * so_global_mtx protects so_gencnt, numopensockets, and the per-socket * so_gencnt field. */ -static struct mtx_padalign so_global_mtx; +static struct mtx so_global_mtx; MTX_SYSINIT(so_global_mtx, &so_global_mtx, "so_glabel", MTX_DEF); /* |
