Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers

[karo-tx-linux.git] / include / drm / drmP.h

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 0c44e4a000fdf3e01bf7d840cce700c4e37464d5..54054e41ec387f4a75016292c187da7ed2762103 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -427,8 +427,8 @@ struct drm_prime_file_private {
 /** File private data */
 struct drm_file {
        int authenticated;
-       pid_t pid;
-       uid_t uid;
+       struct pid *pid;
+       kuid_t uid;
        drm_magic_t magic;
        unsigned long ioctl_count;
        struct list_head lhead;