Module Name: src Committed By: christos Date: Fri Oct 9 02:00:59 UTC 2015
Modified Files: src/sys/kern: kern_pax.c Log Message: PR/50312: Robert Elz: Unconditionally include <sys/exec.h> to fix compilation when PAX_ASLR is not defined. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/kern/kern_pax.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/kern_pax.c diff -u src/sys/kern/kern_pax.c:1.32 src/sys/kern/kern_pax.c:1.33 --- src/sys/kern/kern_pax.c:1.32 Sat Sep 26 12:12:24 2015 +++ src/sys/kern/kern_pax.c Thu Oct 8 22:00:59 2015 @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v #ifdef PAX_ASLR #include <sys/mman.h> -#include <sys/exec.h> int pax_aslr_enabled = 1; int pax_aslr_global = PAX_ASLR;