Module Name: src
Committed By: christos
Date: Thu Apr 7 12:06:50 UTC 2016
Modified Files:
src/sys/kern: exec_subr.c
Log Message:
remove more ifdefs
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/kern/exec_subr.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/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.73 src/sys/kern/exec_subr.c:1.74
--- src/sys/kern/exec_subr.c:1.73 Wed Apr 6 23:31:12 2016
+++ src/sys/kern/exec_subr.c Thu Apr 7 08:06:50 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: exec_subr.c,
#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>
