[src/trunk]: src/sys/arch _KERNEL_OPT police

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

details:   https://anonhg.NetBSD.org/src/rev/f320a0656d50
branches:  trunk
changeset: 956042:f320a0656d50
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Oct 19 17:47:37 2020 +0000

description:
_KERNEL_OPT police

diffstat:

 sys/arch/amd64/amd64/process_machdep.c |   7 +++++--
 sys/arch/arm/arm/process_machdep.c     |   6 ++++--
 sys/arch/i386/i386/process_machdep.c   |   6 ++++--
 sys/arch/sh3/sh3/process_machdep.c     |  12 +++++++-----
 4 files changed, 20 insertions(+), 11 deletions(-)

diffs (102 lines):

diff -r 5485aa39813c -r f320a0656d50 sys/arch/amd64/amd64/process_machdep.c
--- a/sys/arch/amd64/amd64/process_machdep.c    Mon Oct 19 17:00:02 2020 +0000
+++ b/sys/arch/amd64/amd64/process_machdep.c    Mon Oct 19 17:47:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process_machdep.c,v 1.48 2020/10/15 17:37:35 mgorny Exp $      */
+/*     $NetBSD: process_machdep.c,v 1.49 2020/10/19 17:47:37 christos Exp $    */
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -74,9 +74,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.48 2020/10/15 17:37:35 mgorny Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.49 2020/10/19 17:47:37 christos Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_xen.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
diff -r 5485aa39813c -r f320a0656d50 sys/arch/arm/arm/process_machdep.c
--- a/sys/arch/arm/arm/process_machdep.c        Mon Oct 19 17:00:02 2020 +0000
+++ b/sys/arch/arm/arm/process_machdep.c        Mon Oct 19 17:47:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process_machdep.c,v 1.33 2018/01/24 09:04:44 skrll Exp $       */
+/*     $NetBSD: process_machdep.c,v 1.34 2020/10/19 17:47:37 christos Exp $    */
 
 /*
  * Copyright (c) 1993 The Regents of the University of California.
@@ -129,11 +129,13 @@
  *     Set the process's program counter.
  */
 
+#ifdef _KERNEL_OPT
 #include "opt_armfpe.h"
+#endif
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.33 2018/01/24 09:04:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.34 2020/10/19 17:47:37 christos Exp $");
 
 #include <sys/proc.h>
 #include <sys/ptrace.h>
diff -r 5485aa39813c -r f320a0656d50 sys/arch/i386/i386/process_machdep.c
--- a/sys/arch/i386/i386/process_machdep.c      Mon Oct 19 17:00:02 2020 +0000
+++ b/sys/arch/i386/i386/process_machdep.c      Mon Oct 19 17:47:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process_machdep.c,v 1.95 2020/10/15 17:37:35 mgorny Exp $      */
+/*     $NetBSD: process_machdep.c,v 1.96 2020/10/19 17:47:37 christos Exp $    */
 
 /*-
  * Copyright (c) 1998, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -75,9 +75,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.95 2020/10/15 17:37:35 mgorny Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.96 2020/10/19 17:47:37 christos Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_ptrace.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 5485aa39813c -r f320a0656d50 sys/arch/sh3/sh3/process_machdep.c
--- a/sys/arch/sh3/sh3/process_machdep.c        Mon Oct 19 17:00:02 2020 +0000
+++ b/sys/arch/sh3/sh3/process_machdep.c        Mon Oct 19 17:47:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process_machdep.c,v 1.24 2020/10/15 18:58:59 martin Exp $      */
+/*     $NetBSD: process_machdep.c,v 1.25 2020/10/19 17:47:37 christos Exp $    */
 
 /*
  * Copyright (c) 1993 The Regents of the University of California.
@@ -77,7 +77,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.24 2020/10/15 18:58:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.25 2020/10/19 17:47:37 christos Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_compat_netbsd.h"
+#include "opt_ptrace.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,9 +95,6 @@
 #include <machine/psl.h>
 #include <machine/reg.h>
 
-#include "opt_compat_netbsd.h"
-#include "opt_ptrace.h"
-
 #ifdef COMPAT_40
 static int process_machdep_doregs40(struct lwp *, struct lwp *, struct uio *);
 static int process_machdep_read_regs40(struct lwp *l, struct __reg40 *);