[src/trunk]: src/sys remove more ifdefs

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

details:   https://anonhg.NetBSD.org/src/rev/2e8e40cdf76e
branches:  trunk
changeset: 344614:2e8e40cdf76e
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Apr 07 12:06:50 2016 +0000

description:
remove more ifdefs

diffstat:

 sys/kern/exec_subr.c |  7 ++-----
 sys/uvm/uvm_mmap.c   |  7 ++-----
 sys/uvm/uvm_unix.c   |  7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diffs (87 lines):

diff -r a1b9647c2906 -r 2e8e40cdf76e sys/kern/exec_subr.c
--- a/sys/kern/exec_subr.c      Thu Apr 07 06:21:48 2016 +0000
+++ b/sys/kern/exec_subr.c      Thu Apr 07 12:06:50 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_subr.c,v 1.73 2016/04/07 03:31:12 christos Exp $  */
+/*     $NetBSD: exec_subr.c,v 1.74 2016/04/07 12:06:50 christos Exp $  */
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.73 2016/04/07 03:31:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.74 2016/04/07 12:06:50 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -45,10 +45,7 @@
 #include <sys/mman.h>
 #include <sys/resourcevar.h>
 #include <sys/device.h>
-
-#if defined(PAX_ASLR) || defined(PAX_MPROTECT)
 #include <sys/pax.h>
-#endif /* PAX_ASLR || PAX_MPROTECT */
 
 #include <uvm/uvm_extern.h>
 
diff -r a1b9647c2906 -r 2e8e40cdf76e sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Thu Apr 07 06:21:48 2016 +0000
+++ b/sys/uvm/uvm_mmap.c        Thu Apr 07 12:06:50 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.155 2016/04/07 03:31:12 christos Exp $  */
+/*     $NetBSD: uvm_mmap.c,v 1.156 2016/04/07 12:07:36 christos Exp $  */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.155 2016/04/07 03:31:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.156 2016/04/07 12:07:36 christos Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -56,10 +56,7 @@
 #include <sys/filedesc.h>
 #include <sys/resourcevar.h>
 #include <sys/mman.h>
-
-#if defined(PAX_ASLR) || defined(PAX_MPROTECT)
 #include <sys/pax.h>
-#endif /* PAX_ASLR || PAX_MPROTECT */
 
 #include <sys/syscallargs.h>
 
diff -r a1b9647c2906 -r 2e8e40cdf76e sys/uvm/uvm_unix.c
--- a/sys/uvm/uvm_unix.c        Thu Apr 07 06:21:48 2016 +0000
+++ b/sys/uvm/uvm_unix.c        Thu Apr 07 12:06:50 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_unix.c,v 1.46 2016/04/07 03:31:12 christos Exp $   */
+/*     $NetBSD: uvm_unix.c,v 1.47 2016/04/07 12:07:36 christos Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.46 2016/04/07 03:31:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.47 2016/04/07 12:07:36 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -56,10 +56,7 @@
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
-
-#ifdef PAX_MPROTECT
 #include <sys/pax.h>
-#endif /* PAX_MPROTECT */
 
 #include <uvm/uvm.h>