diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2016-10-21 06:56:39 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2016-10-21 06:56:39 +0000 |
| commit | 4928f0807fdb2021171cd35861cec778e001c904 (patch) | |
| tree | fc19738c2e29eddfc92f4701afe1be4020031061 /sys | |
| parent | 688e5cb9e4b7945f4b89653c2d5f4f3192a1af4d (diff) | |
pledge changes needed to support pledging vmd(8) on i386, forthcoming.
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/include/conf.h | 6 | ||||
| -rw-r--r-- | sys/kern/kern_pledge.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/i386/include/conf.h b/sys/arch/i386/include/conf.h index 2518cb550e4..09c82ee00d0 100644 --- a/sys/arch/i386/include/conf.h +++ b/sys/arch/i386/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.15 2011/07/04 16:52:41 nicm Exp $ */ +/* $OpenBSD: conf.h,v 1.16 2016/10/21 06:56:38 mlarkin Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -76,3 +76,7 @@ cdev_decl(acpiapm); #define pctrpoll seltrue cdev_decl(pctr); + +#include "vmm.h" +cdev_decl(vmm); + diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 52b39a8e53f..db89a61ed2c 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.185 2016/10/06 04:39:30 jsg Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.186 2016/10/21 06:56:38 mlarkin Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -68,7 +68,7 @@ #include "pf.h" #include "pty.h" -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) #include "vmm.h" #if NVMM > 0 #include <machine/conf.h> |