[src/trunk]: src/sys/kern move aslr stuff to the aslr section

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

details:   https://anonhg.NetBSD.org/src/rev/f6583ff71fa4
branches:  trunk
changeset: 347805:f6583ff71fa4
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Sep 17 02:29:11 2016 +0000

description:
move aslr stuff to the aslr section

diffstat:

 sys/kern/kern_pax.c |  29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diffs (57 lines):

diff -r f1bf82298537 -r f6583ff71fa4 sys/kern/kern_pax.c
--- a/sys/kern/kern_pax.c       Sat Sep 17 02:27:19 2016 +0000
+++ b/sys/kern/kern_pax.c       Sat Sep 17 02:29:11 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_pax.c,v 1.56 2016/09/03 12:20:58 christos Exp $   */
+/*     $NetBSD: kern_pax.c,v 1.57 2016/09/17 02:29:11 christos Exp $   */
 
 /*
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.56 2016/09/03 12:20:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.57 2016/09/17 02:29:11 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -111,6 +111,19 @@
 #endif
 #define PAX_ASLR_MAX_STACK_WASTE       8
 
+#ifdef PAX_ASLR_DEBUG
+int pax_aslr_debug;
+/* flag set means disable */
+int pax_aslr_flags;
+uint32_t pax_aslr_rand;
+#define PAX_ASLR_STACK         0x01
+#define PAX_ASLR_STACK_GAP     0x02
+#define PAX_ASLR_MMAP          0x04
+#define PAX_ASLR_EXEC_OFFSET   0x08
+#define PAX_ASLR_RTLD_OFFSET   0x10
+#define PAX_ASLR_FIXED         0x20
+#endif
+
 static bool pax_aslr_elf_flags_active(uint32_t);
 #endif /* PAX_ASLR */
 
@@ -135,18 +148,6 @@
 #define        PAX_SEGVGUARD_MAXCRASHES        5
 #endif
 
-#ifdef PAX_ASLR_DEBUG
-int pax_aslr_debug;
-/* flag set means disable */
-int pax_aslr_flags;
-uint32_t pax_aslr_rand;
-#define PAX_ASLR_STACK         0x01
-#define PAX_ASLR_STACK_GAP     0x02
-#define PAX_ASLR_MMAP          0x04
-#define PAX_ASLR_EXEC_OFFSET   0x08
-#define PAX_ASLR_RTLD_OFFSET   0x10
-#define PAX_ASLR_FIXED         0x20
-#endif
 
 static int pax_segvguard_enabled = 1;
 static int pax_segvguard_global = PAX_SEGVGUARD;