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/i915_irq.c | |
| parent | 1f132b7849c453d3aebd227866f743cbcf7f3881 (diff) | |
sync up with current 2.6 kernel bk tree - mostly __user annotations
Diffstat (limited to 'shared-core/i915_irq.c')
| -rw-r--r-- | shared-core/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index f9d5d4b7..e37da827 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -108,7 +108,7 @@ int i915_irq_emit( DRM_IOCTL_ARGS ) return DRM_ERR(EINVAL); } - DRM_COPY_FROM_USER_IOCTL( emit, (drm_i915_irq_emit_t *)data, + DRM_COPY_FROM_USER_IOCTL( emit, (drm_i915_irq_emit_t __user *)data, sizeof(emit) ); result = i915_emit_irq( dev ); @@ -135,7 +135,7 @@ int i915_irq_wait( DRM_IOCTL_ARGS ) return DRM_ERR(EINVAL); } - DRM_COPY_FROM_USER_IOCTL( irqwait, (drm_i915_irq_wait_t *)data, + DRM_COPY_FROM_USER_IOCTL( irqwait, (drm_i915_irq_wait_t __user *)data, sizeof(irqwait) ); return i915_wait_irq( dev, irqwait.irq_seq ); |