From b0c499e2f2176c0d34ced12163c7adb77637477e Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Mon, 2 Sep 2024 11:08:41 +0000
Subject: [PATCH] simplify ccp ifdef; ok bluhm@

---
 sys/kern/kern_pledge.c | 8 +++-----
 1 file 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) &&
-- 
2.20.1