diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-09-02 11:08:42 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-09-02 11:08:42 +0000 |
| commit | 8b21fb40627c9c2a33edbd00f224b6108550383d (patch) | |
| tree | f370b4ad1a4787997af43bc57bd0043dd7f0279b /sys/kern | |
| parent | faaf4baa23be358c1e101da9d93cb8f50dfdfdbe (diff) | |
simplify ccp ifdef; ok bluhm@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_pledge.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 0a3d65ce1b5..e1483fdbd39 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.317 2024/09/01 17:13:46 bluhm Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.318 2024/09/02 11:08:41 jsg Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -73,10 +73,8 @@ #if defined(__amd64__) #include "vmm.h" -#if NVMM > 0 -#include <machine/conf.h> -#endif #include "ccp.h" +#include <machine/conf.h> #endif #include "drm.h" @@ -1350,7 +1348,7 @@ pledge_ioctl(struct proc *p, long com, struct file *fp) } #endif -#if defined(__amd64__) && NCCP > 0 && NVMM > 0 +#if NCCP > 0 if ((pledge & PLEDGE_VMM)) { if ((fp->f_type == DTYPE_VNODE) && (vp->v_type == VCHR) && |