[src/netbsd-7-1]: src/sys/kern Pull up following revision(s) (requested by ri...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6dd1d90d9784
branches:  netbsd-7-1
changeset: 800732:6dd1d90d9784
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Jun 03 16:57:16 2017 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1425):
        sys/kern/kern_descrip.c: revision 1.230
Explicitly set the flags instead of masking set values in.
This fixes FNONBLOCK weirdness seen in audio.c
OK christos@ and martin@.

diffstat:

 sys/kern/kern_descrip.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 67148e2f47b6 -r 6dd1d90d9784 sys/kern/kern_descrip.c
--- a/sys/kern/kern_descrip.c   Sat Jun 03 16:54:25 2017 +0000
+++ b/sys/kern/kern_descrip.c   Sat Jun 03 16:57:16 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_descrip.c,v 1.225.2.1 2015/08/04 17:24:59 snj Exp $       */
+/*     $NetBSD: kern_descrip.c,v 1.225.2.1.6.1 2017/06/03 16:57:16 snj Exp $   */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.225.2.1 2015/08/04 17:24:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.225.2.1.6.1 2017/06/03 16:57:16 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1864,7 +1864,7 @@
        fdfile_t *ff;
        filedesc_t *fdp;
 
-       fp->f_flag |= flag & FMASK;
+       fp->f_flag = flag & FMASK;
        fdp = curproc->p_fd;
        ff = fdp->fd_dt->dt_ff[fd];
        KASSERT(ff != NULL);