4 files changed, 2 insertions, 8 deletions
diff --git a/sys/dev/pci/drm/include/linux/gfp.h b/sys/dev/pci/drm/include/linux/gfp.h
index d1c8d60162d..c9c909edb53 100644
--- a/sys/dev/pci/drm/include/linux/gfp.h
+++ b/sys/dev/pci/drm/include/linux/gfp.h
@@ -24,7 +24,6 @@
 #define GFP_NOWAIT		M_NOWAIT
 #define GFP_KERNEL		(M_WAITOK | M_CANFAIL)
 #define GFP_USER		(M_WAITOK | M_CANFAIL)
-#define GFP_TEMPORARY		(M_WAITOK | M_CANFAIL)
 #define GFP_HIGHUSER		0
 #define GFP_DMA32		__GFP_DMA32
 #define GFP_TRANSHUGE_LIGHT	0
diff --git a/sys/dev/pci/drm/include/linux/pm_qos.h b/sys/dev/pci/drm/include/linux/pm_qos.h
index e4bc138a903..6350c56e885 100644
--- a/sys/dev/pci/drm/include/linux/pm_qos.h
+++ b/sys/dev/pci/drm/include/linux/pm_qos.h
@@ -6,8 +6,6 @@
 struct pm_qos_request {
 };
 
-#define PM_QOS_CPU_DMA_LATENCY	1
-
 #define PM_QOS_DEFAULT_VALUE	-1
 
 #define pm_qos_update_request(a, b)
diff --git a/sys/dev/pci/drm/include/linux/timer.h b/sys/dev/pci/drm/include/linux/timer.h
index 5fcd73ac696..ff4c7e2cfff 100644
--- a/sys/dev/pci/drm/include/linux/timer.h
+++ b/sys/dev/pci/drm/include/linux/timer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timer.h,v 1.4 2020/11/17 10:01:41 jsg Exp $	*/
+/*	$OpenBSD: timer.h,v 1.5 2020/11/17 11:20:59 jsg Exp $	*/
 /*
  * Copyright (c) 2013, 2014, 2015 Mark Kettenis
  *
@@ -25,7 +25,6 @@
 #include <linux/ktime.h>
 
 #define mod_timer(x, y)		timeout_add((x), (y - jiffies))
-#define mod_timer_pinned(x, y)	timeout_add((x), (y - jiffies))
 #define del_timer_sync(x)	timeout_del_barrier((x))
 #define del_timer(x)		timeout_del((x))
 #define timer_pending(x)	timeout_pending((x))
diff --git a/sys/dev/pci/drm/include/linux/uaccess.h b/sys/dev/pci/drm/include/linux/uaccess.h
index 459eadf0b21..765a0546caf 100644
--- a/sys/dev/pci/drm/include/linux/uaccess.h
+++ b/sys/dev/pci/drm/include/linux/uaccess.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaccess.h,v 1.3 2020/06/08 04:48:15 jsg Exp $	*/
+/*	$OpenBSD: uaccess.h,v 1.4 2020/11/17 11:20:59 jsg Exp $	*/
 /*
  * Copyright (c) 2015 Mark Kettenis
  *
@@ -64,8 +64,6 @@ copy_from_user(void *to, const void *from, unsigned len)
 		goto err;					\
 })
 
-#define VERIFY_READ     0x1
-#define VERIFY_WRITE    0x2
 static inline int
 access_ok(const void *addr, unsigned long size)
 {