Module Name: src
Committed By: pgoyette
Date: Tue Jun 14 03:34:01 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
Re-arrange PAX_ASLR options to keep the _DEBUG next to the main option.
To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 src/sys/arch/amd64/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.433 src/sys/arch/amd64/conf/GENERIC:1.434
--- src/sys/arch/amd64/conf/GENERIC:1.433 Sat May 14 17:11:30 2016
+++ src/sys/arch/amd64/conf/GENERIC Tue Jun 14 03:34:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.433 2016/05/14 17:11:30 christos Exp $
+# $NetBSD: GENERIC,v 1.434 2016/06/14 03:34:01 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.433 $"
+#ident "GENERIC-$Revision: 1.434 $"
maxusers 64 # estimated number of users
@@ -1317,8 +1317,8 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
-options PAX_ASLR_DEBUG=1 # PaX ASLR debug
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
+options PAX_ASLR_DEBUG=1 # PaX ASLR debug
