Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/sys/kern Pull up following revision(s) (requested by kami...



details:   https://anonhg.NetBSD.org/src/rev/17a4d42b8cd0
branches:  netbsd-9
changeset: 1000991:17a4d42b8cd0
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 15 19:07:14 2019 +0000

description:
Pull up following revision(s) (requested by kamil in ticket #323):

        sys/kern/sys_ptrace_common.c: revision 1.65

Correct the same expression on both sides of |
PR sw-bug/54610 by David Binderman

diffstat:

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

diffs (27 lines):

diff -r 4e4ded49d4d1 -r 17a4d42b8cd0 sys/kern/sys_ptrace_common.c
--- a/sys/kern/sys_ptrace_common.c      Tue Oct 15 19:05:38 2019 +0000
+++ b/sys/kern/sys_ptrace_common.c      Tue Oct 15 19:07:14 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_ptrace_common.c,v 1.58.2.6 2019/10/15 19:03:20 martin Exp $        */
+/*     $NetBSD: sys_ptrace_common.c,v 1.58.2.7 2019/10/15 19:07:14 martin Exp $        */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.58.2.6 2019/10/15 19:03:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.58.2.7 2019/10/15 19:07:14 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ptrace.h"
@@ -1265,7 +1265,7 @@
                                        break;
                        }
                } else {
-                       if (lt->l_flag & (LW_WSUSPEND | LW_WSUSPEND)) {
+                       if (lt->l_flag & (LW_WSUSPEND | LW_DBGSUSPEND)) {
                                error = EDEADLK;
                                break;
                        }



Home | Main Index | Thread Index | Old Index