Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern revert atomics for so_options since it is a short.
details: https://anonhg.NetBSD.org/src/rev/af5a29121323
branches: trunk
changeset: 773040:af5a29121323
user: christos <christos%NetBSD.org@localhost>
date: Wed Jan 25 16:56:13 2012 +0000
description:
revert atomics for so_options since it is a short.
diffstat:
sys/kern/uipc_syscalls.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (30 lines):
diff -r 9920483398b3 -r af5a29121323 sys/kern/uipc_syscalls.c
--- a/sys/kern/uipc_syscalls.c Wed Jan 25 16:51:17 2012 +0000
+++ b/sys/kern/uipc_syscalls.c Wed Jan 25 16:56:13 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.153 2012/01/25 15:51:24 christos Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.154 2012/01/25 16:56:13 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.153 2012/01/25 15:51:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.154 2012/01/25 16:56:13 christos Exp $");
#include "opt_pipe.h"
@@ -1015,9 +1015,9 @@
sockopt_init(&sopt, SCARG(uap, level), SCARG(uap, name), 0);
if (fp->f_flag & FNOSIGPIPE)
- atomic_or_uint(&so->so_options, SO_NOSIGPIPE);
+ so->so_options |= SO_NOSIGPIPE;
else
- atomic_and_uint(&so->so_options, ~SO_NOSIGPIPE);
+ so->so_options &= ~SO_NOSIGPIPE;
error = sogetopt(so, &sopt);
if (error)
goto out;
Home |
Main Index |
Thread Index |
Old Index