aboutsummaryrefslogtreecommitdiff
path: root/shared-core/radeon_irq.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2004-07-25 08:47:38 +0000
committerDave Airlie <airlied@linux.ie>2004-07-25 08:47:38 +0000
commit02df04d71d373f1f779ebfd5d383a704ebb397ee (patch)
tree1e58f7bfc78d0c99dc25981603e9fca0ed9a6859 /shared-core/radeon_irq.c
parent1f132b7849c453d3aebd227866f743cbcf7f3881 (diff)
sync up with current 2.6 kernel bk tree - mostly __user annotations
Diffstat (limited to 'shared-core/radeon_irq.c')
-rw-r--r--shared-core/radeon_irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c
index f503153a..51d19493 100644
--- a/shared-core/radeon_irq.c
+++ b/shared-core/radeon_irq.c
@@ -187,7 +187,7 @@ int radeon_irq_emit( DRM_IOCTL_ARGS )
return DRM_ERR(EINVAL);
}
- DRM_COPY_FROM_USER_IOCTL( emit, (drm_radeon_irq_emit_t *)data,
+ DRM_COPY_FROM_USER_IOCTL( emit, (drm_radeon_irq_emit_t __user *)data,
sizeof(emit) );
result = radeon_emit_irq( dev );
@@ -214,7 +214,7 @@ int radeon_irq_wait( DRM_IOCTL_ARGS )
return DRM_ERR(EINVAL);
}
- DRM_COPY_FROM_USER_IOCTL( irqwait, (drm_radeon_irq_wait_t *)data,
+ DRM_COPY_FROM_USER_IOCTL( irqwait, (drm_radeon_irq_wait_t __user*)data,
sizeof(irqwait) );
return radeon_wait_irq( dev, irqwait.irq_seq );