diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-16 19:01:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-16 19:01:46 -0700 |
| commit | ec50f2a97a4a7098a81b40030e0bfe28bdc43740 (patch) | |
| tree | 3b02c10ed8578fafd2d07156ecd7896c923aee01 /include | |
| parent | d5fe85af85367d5892e4308f596de4e2a5fb9017 (diff) | |
| parent | e9ced8e040ebe40e9953db90acbe7d0b58702ebb (diff) | |
| download | linux-ec50f2a97a4a7098a81b40030e0bfe28bdc43740.tar.gz linux-ec50f2a97a4a7098a81b40030e0bfe28bdc43740.tar.bz2 linux-ec50f2a97a4a7098a81b40030e0bfe28bdc43740.zip | |
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Fix for radeon nomodeset regression, old radeon interface cliprects
fix, 2 qxl crasher fixes, and a couple of minor cleanups.
I may have a new AMD hw support branch next week, its one of those
doesn't affect anything existing just adds new support, I'll see how
it shapes up and I might ask you to take it, just thought I'd warn in
advance."
* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: restore nomodeset operation (v2)
qxl: fix bug with object eviction and update area
drm/qxl: drop active_user_framebuffer as its unneeded
qxl: drop unused variable.
drm/qxl: fix ioport interactions for kernel submitted commands.
drm: remove unused wrapper macros
drm/radeon: check incoming cliprects pointer
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_os_linux.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h index 393369147a2d..675ddf4b441f 100644 --- a/include/drm/drm_os_linux.h +++ b/include/drm/drm_os_linux.h @@ -87,15 +87,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) /** Other copying of data from kernel space */ #define DRM_COPY_TO_USER(arg1, arg2, arg3) \ copy_to_user(arg1, arg2, arg3) -/* Macros for copyfrom user, but checking readability only once */ -#define DRM_VERIFYAREA_READ( uaddr, size ) \ - (access_ok( VERIFY_READ, uaddr, size ) ? 0 : -EFAULT) -#define DRM_COPY_FROM_USER_UNCHECKED(arg1, arg2, arg3) \ - __copy_from_user(arg1, arg2, arg3) -#define DRM_COPY_TO_USER_UNCHECKED(arg1, arg2, arg3) \ - __copy_to_user(arg1, arg2, arg3) -#define DRM_GET_USER_UNCHECKED(val, uaddr) \ - __get_user(val, uaddr) #define DRM_HZ HZ |