CVS commit: src/sys/uvm

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Thu Apr  7 12:07:36 UTC 2016

Modified Files:
        src/sys/uvm: uvm_mmap.c uvm_unix.c

Log Message:
remove more ifdefs


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/uvm/uvm_mmap.c
cvs rdiff -u -r1.46 -r1.47 src/sys/uvm/uvm_unix.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.155 src/sys/uvm/uvm_mmap.c:1.156
--- src/sys/uvm/uvm_mmap.c:1.155	Wed Apr  6 23:31:12 2016
+++ src/sys/uvm/uvm_mmap.c	Thu Apr  7 08:07:36 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v
 #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>
 

Index: src/sys/uvm/uvm_unix.c
diff -u src/sys/uvm/uvm_unix.c:1.46 src/sys/uvm/uvm_unix.c:1.47
--- src/sys/uvm/uvm_unix.c:1.46	Wed Apr  6 23:31:12 2016
+++ src/sys/uvm/uvm_unix.c	Thu Apr  7 08:07:36 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
-
-#ifdef PAX_MPROTECT
 #include <sys/pax.h>
-#endif /* PAX_MPROTECT */
 
 #include <uvm/uvm.h>