Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern PR/50312: Robert Elz: Unconditionally include <sys/...



details:   https://anonhg.NetBSD.org/src/rev/7b671276f485
branches:  trunk
changeset: 340894:7b671276f485
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 09 02:00:59 2015 +0000

description:
PR/50312: Robert Elz: Unconditionally include <sys/exec.h> to fix compilation
when PAX_ASLR is not defined.

diffstat:

 sys/kern/kern_pax.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 3ebe1b72e840 -r 7b671276f485 sys/kern/kern_pax.c
--- a/sys/kern/kern_pax.c       Fri Oct 09 01:50:09 2015 +0000
+++ b/sys/kern/kern_pax.c       Fri Oct 09 02:00:59 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_pax.c,v 1.32 2015/09/26 16:12:24 maxv Exp $       */
+/*     $NetBSD: kern_pax.c,v 1.33 2015/10/09 02:00:59 christos Exp $   */
 
 /*
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,12 +57,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.32 2015/09/26 16:12:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.33 2015/10/09 02:00:59 christos Exp $");
 
 #include "opt_pax.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
+#include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/pax.h>
 #include <sys/sysctl.h>
@@ -82,7 +83,6 @@
 
 #ifdef PAX_ASLR
 #include <sys/mman.h>
-#include <sys/exec.h>
 
 int pax_aslr_enabled = 1;
 int pax_aslr_global = PAX_ASLR;



Home | Main Index | Thread Index | Old Index