From 02b443fe3109e13b4f6482abe6170ecacaa89a9e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 5 Nov 2007 11:48:34 +1000 Subject: [PATCH] --- yaml --- r: 73228 b: refs/heads/master c: 747824c67b31b5d6e9379fae8af2ef46cf715f62 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_os_linux.h | 8 -------- trunk/drivers/char/drm/savage_bci.c | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 3b11d33cd8f0..dab6ddb0b12e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9618ac08b37992c80ca320b3463559873726837 +refs/heads/master: 747824c67b31b5d6e9379fae8af2ef46cf715f62 diff --git a/trunk/drivers/char/drm/drm_os_linux.h b/trunk/drivers/char/drm/drm_os_linux.h index 76e44ac94fb5..daa69c9d8977 100644 --- a/trunk/drivers/char/drm/drm_os_linux.h +++ b/trunk/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/trunk/drivers/char/drm/savage_bci.c b/trunk/drivers/char/drm/savage_bci.c index 59484d56b333..d465b2f9c1cd 100644 --- a/trunk/drivers/char/drm/savage_bci.c +++ b/trunk/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;