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/i915_mem.c | |
| parent | 1f132b7849c453d3aebd227866f743cbcf7f3881 (diff) | |
sync up with current 2.6 kernel bk tree - mostly __user annotations
Diffstat (limited to 'shared/i915_mem.c')
| -rw-r--r-- | shared/i915_mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared/i915_mem.c b/shared/i915_mem.c index 0e413d47..2a2379d0 100644 --- a/shared/i915_mem.c +++ b/shared/i915_mem.c @@ -268,7 +268,7 @@ int i915_mem_alloc( DRM_IOCTL_ARGS ) return DRM_ERR(EINVAL); } - DRM_COPY_FROM_USER_IOCTL( alloc, (drm_i915_mem_alloc_t *)data, + DRM_COPY_FROM_USER_IOCTL( alloc, (drm_i915_mem_alloc_t __user *)data, sizeof(alloc) ); heap = get_heap( dev_priv, alloc.region ); @@ -312,7 +312,7 @@ int i915_mem_free( DRM_IOCTL_ARGS ) return DRM_ERR(EINVAL); } - DRM_COPY_FROM_USER_IOCTL( memfree, (drm_i915_mem_free_t *)data, + DRM_COPY_FROM_USER_IOCTL( memfree, (drm_i915_mem_free_t __user *)data, sizeof(memfree) ); heap = get_heap( dev_priv, memfree.region ); @@ -343,7 +343,7 @@ int i915_mem_init_heap( DRM_IOCTL_ARGS ) return DRM_ERR(EINVAL); } - DRM_COPY_FROM_USER_IOCTL( initheap, (drm_i915_mem_init_heap_t *)data, + DRM_COPY_FROM_USER_IOCTL( initheap, (drm_i915_mem_init_heap_t __user *)data, sizeof(initheap) ); heap = get_heap( dev_priv, initheap.region ); |