diff options
| author |   Dave Airlie <airlied@linux.ie> | 2007-11-05 11:48:34 +1000 |
|---|---|---|
| committer |   Dave Airlie <airlied@optimus.(none)> | 2007-11-06 10:11:12 +1000 |
| commit | 747824c67b31b5d6e9379fae8af2ef46cf715f62 (patch) | |
| tree | 96f9a1870c1c0657152373e3012d2062035ddb87 /drivers | |
| parent | drm: remove second forward decleration of drm device struct. (diff) | |
| download | linux-dev-747824c67b31b5d6e9379fae8af2ef46cf715f62.tar.xz linux-dev-747824c67b31b5d6e9379fae8af2ef46cf715f62.zip | |
drm: remove remnants of DRM_COPY_FROM/TO_USER_IOCTL
This is a bug in the savage driver since I introduced these changes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/drm/drm_os_linux.h | 8 | ||||
| -rw-r--r-- | drivers/char/drm/savage_bci.c | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h index 76e44ac94fb5..daa69c9d8977 100644 --- a/drivers/char/drm/drm_os_linux.h +++ b/drivers/char/drm/drm_os_linux.h @@ -62,14 +62,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) #endif -/** For data going into the kernel through the ioctl argument */ -#define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3) \ - if ( copy_from_user(&arg1, arg2, arg3) ) \ - return -EFAULT -/** For data going from the kernel through the ioctl argument */ -#define DRM_COPY_TO_USER_IOCTL(arg1, arg2, arg3) \ - if ( copy_to_user(arg1, &arg2, arg3) ) \ - return -EFAULT /** Other copying of data to kernel space */ #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ copy_from_user(arg1, arg2, arg3) diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c index 59484d56b333..d465b2f9c1cd 100644 --- a/drivers/char/drm/savage_bci.c +++ b/drivers/char/drm/savage_bci.c @@ -968,9 +968,6 @@ static int savage_bci_event_wait(struct drm_device *dev, void *data, struct drm_ DRM_DEBUG("\n"); - DRM_COPY_FROM_USER_IOCTL(event, (drm_savage_event_wait_t __user *) data, - sizeof(event)); - UPDATE_EVENT_COUNTER(); if (dev_priv->status_ptr) hw_e = dev_priv->status_ptr[1] & 0xffff; |