diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-07-25 08:47:38 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-07-25 08:47:38 +0000 |
| commit | 02df04d71d373f1f779ebfd5d383a704ebb397ee (patch) | |
| tree | 1e58f7bfc78d0c99dc25981603e9fca0ed9a6859 /linux-core/drm_ioctl.c | |
| parent | 1f132b7849c453d3aebd227866f743cbcf7f3881 (diff) | |
sync up with current 2.6 kernel bk tree - mostly __user annotations
Diffstat (limited to 'linux-core/drm_ioctl.c')
| -rw-r--r-- | linux-core/drm_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_ioctl.c b/linux-core/drm_ioctl.c index 379a4f05..2ecce48f 100644 --- a/linux-core/drm_ioctl.c +++ b/linux-core/drm_ioctl.c @@ -54,7 +54,7 @@ int DRM(getunique)(struct inode *inode, struct file *filp, { drm_file_t *priv = filp->private_data; drm_device_t *dev = priv->dev; - drm_unique_t __user *argp = (void __user *)arg; + drm_unique_t __user *argp = (void __user *)arg; drm_unique_t u; if (copy_from_user(&u, argp, sizeof(u))) @@ -93,7 +93,7 @@ int DRM(setunique)(struct inode *inode, struct file *filp, if (dev->unique_len || dev->unique) return -EBUSY; - if (copy_from_user(&u, (drm_unique_t __user *)arg, sizeof(u))) + if (copy_from_user(&u, (drm_unique_t __user *)arg, sizeof(u))) return -EFAULT; if (!u.unique_len || u.unique_len > 1024) return -EINVAL; @@ -234,7 +234,7 @@ int DRM(getclient)( struct inode *inode, struct file *filp, { drm_file_t *priv = filp->private_data; drm_device_t *dev = priv->dev; - drm_client_t __user *argp = (void __user *)arg; + drm_client_t __user *argp = (void __user *)arg; drm_client_t client; drm_file_t *pt; int idx; |