From 65bd0920b3c3389986dc71cb2499680261f487c3 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Thu, 23 Jun 2011 23:42:43 +0000
Subject: [PATCH] Allow PAX_ASLR to be used by itself.

---
 sys/conf/files       | 4 ++--
 sys/kern/exec_subr.c | 8 ++++----
 sys/uvm/uvm_mmap.c   | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 265f301222b7..62babcc46f84 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1016 2011/05/28 19:30:19 matt Exp $
+#	$NetBSD: files,v 1.1017 2011/06/23 23:42:43 matt Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -1480,7 +1480,7 @@ file	kern/kern_mutex.c
 file	kern/kern_mutex_obj.c
 file	kern/kern_fileassoc.c		fileassoc
 file	kern/kern_ntptime.c
-file	kern/kern_pax.c			pax_mprotect | pax_segvguard
+file	kern/kern_pax.c			pax_mprotect | pax_segvguard | pax_aslr
 file	kern/kern_physio.c
 file	kern/kern_pmf.c
 file	kern/kern_proc.c
diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c
index bfdc75174742..fba17fc09504 100644
--- a/sys/kern/exec_subr.c
+++ b/sys/kern/exec_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_subr.c,v 1.68 2011/03/04 04:25:58 christos Exp $	*/
+/*	$NetBSD: exec_subr.c,v 1.69 2011/06/23 23:42:44 matt 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.68 2011/03/04 04:25:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.69 2011/06/23 23:42:44 matt Exp $");
 
 #include "opt_pax.h"
 
@@ -46,9 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.68 2011/03/04 04:25:58 christos Exp
 #include <sys/resourcevar.h>
 #include <sys/device.h>
 
-#ifdef PAX_MPROTECT
+#if defined(PAX_ASLR) || defined(PAX_MPROTECT)
 #include <sys/pax.h>
-#endif /* PAX_MPROTECT */
+#endif /* PAX_ASLR || PAX_MPROTECT */
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 69ad4329641a..5a5ce5ef3444 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.136 2011/06/12 03:36:03 rmind Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.137 2011/06/23 23:42:44 matt 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.136 2011/06/12 03:36:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.137 2011/06/23 23:42:44 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -67,9 +67,9 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.136 2011/06/12 03:36:03 rmind Exp $")
 #include <sys/verified_exec.h>
 #endif /* NVERIEXEC > 0 */
  
-#ifdef PAX_MPROTECT
+#if defined(PAX_ASLR) || defined(PAX_MPROTECT)
 #include <sys/pax.h>
-#endif /* PAX_MPROTECT */
+#endif /* PAX_ASLR || PAX_MPROTECT */
 
 #include <miscfs/specfs/specdev.h>