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 /shared-core/r128_drm.h | |
parent | 1f132b7849c453d3aebd227866f743cbcf7f3881 (diff) |
sync up with current 2.6 kernel bk tree - mostly __user annotations
Diffstat (limited to 'shared-core/r128_drm.h')
-rw-r--r-- | shared-core/r128_drm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/shared-core/r128_drm.h b/shared-core/r128_drm.h index ae51de34..0cba17d1 100644 --- a/shared-core/r128_drm.h +++ b/shared-core/r128_drm.h @@ -308,14 +308,14 @@ typedef struct drm_r128_depth { R128_READ_PIXELS = 0x04 } func; int n; - int *x; - int *y; - unsigned int *buffer; - unsigned char *mask; + int __user *x; + int __user *y; + unsigned int __user *buffer; + unsigned char __user *mask; } drm_r128_depth_t; typedef struct drm_r128_stipple { - unsigned int *mask; + unsigned int __user *mask; } drm_r128_stipple_t; typedef struct drm_r128_indirect { @@ -339,7 +339,7 @@ typedef struct drm_r128_fullscreen { typedef struct drm_r128_getparam { int param; - void *value; + void __user *value; } drm_r128_getparam_t; #endif |