git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
char
/
drm
/
drm_auth.h
diff --git
a/drivers/char/drm/drm_auth.h
b/drivers/char/drm/drm_auth.h
index
00049d6
..
fe09987
100644
(file)
--- a/
drivers/char/drm/drm_auth.h
+++ b/
drivers/char/drm/drm_auth.h
@@
-194,7
+194,7
@@
int DRM(getmagic)(struct inode *inode, struct file *filp,
}
DRM_DEBUG("%u\n", auth.magic);
}
DRM_DEBUG("%u\n", auth.magic);
- if (copy_to_user((drm_auth_t *)arg, &auth, sizeof(auth)))
+ if (copy_to_user((drm_auth_t
__user
*)arg, &auth, sizeof(auth)))
return -EFAULT;
return 0;
}
return -EFAULT;
return 0;
}
@@
-218,7
+218,7
@@
int DRM(authmagic)(struct inode *inode, struct file *filp,
drm_auth_t auth;
drm_file_t *file;
drm_auth_t auth;
drm_file_t *file;
- if (copy_from_user(&auth, (drm_auth_t *)arg, sizeof(auth)))
+ if (copy_from_user(&auth, (drm_auth_t
__user
*)arg, sizeof(auth)))
return -EFAULT;
DRM_DEBUG("%u\n", auth.magic);
if ((file = DRM(find_file)(dev, auth.magic))) {
return -EFAULT;
DRM_DEBUG("%u\n", auth.magic);
if ((file = DRM(find_file)(dev, auth.magic))) {