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

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

details:   https://anonhg.NetBSD.org/src/rev/0ee6b2a331f1
branches:  netbsd-9
changeset: 462657:0ee6b2a331f1
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 15 18:50:44 2019 +0000

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

        sys/kern/sys_ptrace_common.c: revision 1.61

Remove 2 static asserts from the kernel ptrace code
sizeof(pid) and sizeof(lwp) will unlikely ever change and the check can
confuse.

The assert has been moved to ATF t_ptrace_wait.c r.1.132.

Requested by <christos>

diffstat:

 sys/kern/sys_ptrace_common.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r 804cfb96a54d -r 0ee6b2a331f1 sys/kern/sys_ptrace_common.c
--- a/sys/kern/sys_ptrace_common.c      Tue Oct 15 18:48:56 2019 +0000
+++ b/sys/kern/sys_ptrace_common.c      Tue Oct 15 18:50:44 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_ptrace_common.c,v 1.58.2.3 2019/10/15 18:38:39 martin Exp $        */
+/*     $NetBSD: sys_ptrace_common.c,v 1.58.2.4 2019/10/15 18:50:44 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.3 2019/10/15 18:38:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.58.2.4 2019/10/15 18:50:44 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ptrace.h"
@@ -704,12 +704,7 @@
                si = &t->p_sigctx.ps_info;
                ps.pe_report_event = si->_reason._ptrace_state._pe_report_event;
 
-               CTASSERT(sizeof(ps.pe_other_pid) ==
-                   sizeof(si->_reason._ptrace_state._option._pe_other_pid));
-               CTASSERT(sizeof(ps.pe_lwp) ==
-                   sizeof(si->_reason._ptrace_state._option._pe_other_pid));
                CTASSERT(sizeof(ps.pe_other_pid) == sizeof(ps.pe_lwp));
-
                ps.pe_other_pid =
                        si->_reason._ptrace_state._option._pe_other_pid;
        }