[src/trunk]: src/sys/arch/amd64/conf Re-arrange PAX_ASLR options to keep the ...

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

details:   https://anonhg.NetBSD.org/src/rev/1a8de7e406d0
branches:  trunk
changeset: 345893:1a8de7e406d0
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Jun 14 03:34:01 2016 +0000

description:
Re-arrange PAX_ASLR options to keep the _DEBUG next to the main option.

diffstat:

 sys/arch/amd64/conf/GENERIC |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 64a5cdd6db83 -r 1a8de7e406d0 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Jun 14 03:05:24 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Jun 14 03:34:01 2016 +0000
@@ -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 @@
 
 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_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