[src/trunk]: src/sys/kern Explicitly set the flags instead of masking set val...

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

details:   https://anonhg.NetBSD.org/src/rev/cc7dd96ff089
branches:  trunk
changeset: 353555:cc7dd96ff089
user:      nat <nat%NetBSD.org@localhost>
date:      Thu May 11 22:38:56 2017 +0000

description:
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 a87dc532e548 -r cc7dd96ff089 sys/kern/kern_descrip.c
--- a/sys/kern/kern_descrip.c   Thu May 11 22:19:29 2017 +0000
+++ b/sys/kern/kern_descrip.c   Thu May 11 22:38:56 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_descrip.c,v 1.229 2015/08/03 04:55:15 christos Exp $      */
+/*     $NetBSD: kern_descrip.c,v 1.230 2017/05/11 22:38:56 nat 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.229 2015/08/03 04:55:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.230 2017/05/11 22:38:56 nat 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);