diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:52:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:52:16 -0400 |
| commit | 8a90bb5116889e98008fbc8178fc2a77bb51df4a (patch) | |
| tree | 210b6755c9ae2d0d66a79f8696469ab50b7621ad /include/drm/drm_os_linux.h | |
| parent | d47333ddb234dbc661ab2a4fe019758bd33ba33b (diff) | |
| parent | 1ab9ecc24819a8cf8ee982aaf6fb83298f094b0d (diff) | |
Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.10
A series of driver specific updates, none particularly critical, plus
one fix to the compressed API code to handle capture streams properly
which is very safe for mainline as there's no current users.
Diffstat (limited to 'include/drm/drm_os_linux.h')
| -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) | |||
| 87 | /** Other copying of data from kernel space */ | 87 | /** Other copying of data from kernel space */ |
| 88 | #define DRM_COPY_TO_USER(arg1, arg2, arg3) \ | 88 | #define DRM_COPY_TO_USER(arg1, arg2, arg3) \ |
| 89 | copy_to_user(arg1, arg2, arg3) | 89 | copy_to_user(arg1, arg2, arg3) |
| 90 | /* Macros for copyfrom user, but checking readability only once */ | ||
| 91 | #define DRM_VERIFYAREA_READ( uaddr, size ) \ | ||
| 92 | (access_ok( VERIFY_READ, uaddr, size ) ? 0 : -EFAULT) | ||
| 93 | #define DRM_COPY_FROM_USER_UNCHECKED(arg1, arg2, arg3) \ | ||
| 94 | __copy_from_user(arg1, arg2, arg3) | ||
| 95 | #define DRM_COPY_TO_USER_UNCHECKED(arg1, arg2, arg3) \ | ||
| 96 | __copy_to_user(arg1, arg2, arg3) | ||
| 97 | #define DRM_GET_USER_UNCHECKED(val, uaddr) \ | ||
| 98 | __get_user(val, uaddr) | ||
| 99 | 90 | ||
| 100 | #define DRM_HZ HZ | 91 | #define DRM_HZ HZ |
| 101 | 92 | ||
