summaryrefslogtreecommitdiff
path: root/include/drm/drmP.h
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-08-29 14:12:33 +0400
committerDave Airlie <airlied@redhat.com>2014-09-10 11:40:35 +0400
commit2791ee85e1e9805d600782e554f706458ec6c84e (patch)
treea11c15dead03028cc07e591106f2ba8a528a2b94 /include/drm/drmP.h
parentcc5ea5947a52b98cd9a03d4011a5a12b4e5a99c4 (diff)
downloadlinux-2791ee85e1e9805d600782e554f706458ec6c84e.tar.xz
drm: replace weird conditional includes
pte_wrprotect() is only used by drm_vm.c, so move the include there. Also include it unconditionally, all architectures provide this header! Furthermore, replace asm/current.h with sched.h, which includes asm/current.h unconditionally. This way we get the same effect and avoid direct asm/ includes. Furthermore, drop the weird __alpha__ protection. It's safe to include sched.h everywhere (and the wait.h comment doesn't apply, anyway). Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r--include/drm/drmP.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 7a3c73c5375d..31fb30047770 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -36,12 +36,7 @@
#define _DRM_P_H_
#ifdef __KERNEL__
-#ifdef __alpha__
-/* add include of current.h so that "current" is defined
- * before static inline funcs in wait.h. Doing this so we
- * can build the DRM (part of PI DRI). 4/21/2000 S + B */
-#include <asm/current.h>
-#endif /* __alpha__ */
+#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/kref.h>
#include <linux/miscdevice.h>
@@ -58,9 +53,6 @@
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/ratelimit.h>
-#if defined(__alpha__) || defined(__powerpc__)
-#include <asm/pgtable.h> /* For pte_wrprotect */
-#endif
#include <asm/mman.h>
#include <asm/uaccess.h>
#include <linux/types.h>