diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 12:12:33 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-10 17:40:35 +1000 |
| commit | 2791ee85e1e9805d600782e554f706458ec6c84e (patch) | |
| tree | a11c15dead03028cc07e591106f2ba8a528a2b94 | |
| parent | cc5ea5947a52b98cd9a03d4011a5a12b4e5a99c4 (diff) | |
| download | op-kernel-dev-2791ee85e1e9805d600782e554f706458ec6c84e.zip op-kernel-dev-2791ee85e1e9805d600782e554f706458ec6c84e.tar.gz | |
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>
| -rw-r--r-- | drivers/gpu/drm/drm_vm.c | 1 | ||||
| -rw-r--r-- | include/drm/drmP.h | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index be25174..967e570 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -40,6 +40,7 @@ #include <linux/efi.h> #include <linux/slab.h> #endif +#include <asm/pgtable.h> #include "drm_legacy.h" struct drm_vma_entry { diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 7a3c73c..31fb300 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> |
