diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-06-29 01:46:36 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-06-29 01:46:36 +0000 |
| commit | 18206aaa9ce27202c769d4bcaae795d8a5e1ac7c (patch) | |
| tree | f2d4ecf42dabe7b731126958702f8944e8b309c6 | |
| parent | ea040fd1ebeb27382b47051531a3c099643187a5 (diff) | |
remove arch ifdefs around drm.h include
ok deraadt@ kettenis@
| -rw-r--r-- | sys/kern/kern_pledge.c | 7 | ||||
| -rw-r--r-- | sys/uvm/uvm_device.c | 7 | ||||
| -rw-r--r-- | sys/uvm/uvm_pdaemon.c | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index ef8bb7ad738..1fa85ccf603 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.274 2021/06/26 09:23:24 kettenis Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.275 2021/06/29 01:46:35 jsg Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -80,12 +80,7 @@ #endif #endif -#if defined(__amd64__) || defined(__arm64__) || \ - defined(__i386__) || defined(__loongson__) || \ - defined(__macppc__) || defined(__powerpc64__) || \ - defined(__riscv64__) || defined(__sparc64__) #include "drm.h" -#endif uint64_t pledgereq_flags(const char *req); int parsepledges(struct proc *p, const char *kname, diff --git a/sys/uvm/uvm_device.c b/sys/uvm/uvm_device.c index aad6829f555..0a8cf7b8560 100644 --- a/sys/uvm/uvm_device.c +++ b/sys/uvm/uvm_device.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_device.c,v 1.63 2021/06/25 19:27:40 matthieu Exp $ */ +/* $OpenBSD: uvm_device.c,v 1.64 2021/06/29 01:46:35 jsg Exp $ */ /* $NetBSD: uvm_device.c,v 1.30 2000/11/25 06:27:59 chs Exp $ */ /* @@ -41,12 +41,7 @@ #include <uvm/uvm.h> #include <uvm/uvm_device.h> -#if defined(__amd64__) || defined(__arm64__) || \ - defined(__i386__) || defined(__loongson__) || \ - defined(__macppc__) || defined(__powerpc64__) || \ - defined(__riscv64__) || defined(__sparc64__) #include "drm.h" -#endif /* * private global data structure diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c index b31d37a05f4..e0ab150cddc 100644 --- a/sys/uvm/uvm_pdaemon.c +++ b/sys/uvm/uvm_pdaemon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_pdaemon.c,v 1.92 2021/06/25 19:27:40 matthieu Exp $ */ +/* $OpenBSD: uvm_pdaemon.c,v 1.93 2021/06/29 01:46:35 jsg Exp $ */ /* $NetBSD: uvm_pdaemon.c,v 1.23 2000/08/20 10:24:14 bjh21 Exp $ */ /* @@ -81,12 +81,7 @@ #include <uvm/uvm.h> -#if defined(__amd64__) || defined(__arm64__) || \ - defined(__i386__) || defined(__loongson__) || \ - defined(__macppc__) || defined(__powerpc64__) || \ - defined(__riscv64__) || defined(__sparc64__) #include "drm.h" -#endif #if NDRM > 0 extern void drmbackoff(long); |