Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/50312: Robert Elz: Unconditionally include <sys/exec.h> to fix compilation 

when PAX_ASLR is not defined.
This commit is contained in:
christos 2015-10-09 02:00:59 +00:00
parent 6a74db0c04
commit a89334cd83
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_pax.c
View File

@ -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. * Copyright (c) 2015 The NetBSD Foundation, Inc.
@ -57,12 +57,13 @@
*/ */
#include <sys/cdefs.h> #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 "opt_pax.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/exec.h>
#include <sys/exec_elf.h> #include <sys/exec_elf.h>
#include <sys/pax.h> #include <sys/pax.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
@ -82,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.32 2015/09/26 16:12:24 maxv Exp $");
#ifdef PAX_ASLR #ifdef PAX_ASLR
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/exec.h>
int pax_aslr_enabled = 1; int pax_aslr_enabled = 1;
int pax_aslr_global = PAX_ASLR; int pax_aslr_global = PAX_ASLR;