UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: DRM: fix memset size error
  drm: remove remnants of DRM_COPY_FROM/TO_USER_IOCTL
  drm: remove second forward decleration of drm device struct.
This commit is contained in:
Linus Torvalds 2007-11-05 17:43:36 -08:00
parent f8a9efb528 246a3d186a
commit 2658770b2c
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/drm/drmP.h
View File

@ -559,8 +559,6 @@ struct drm_mm {
* a family of cards. There will one drm_device for each card present * a family of cards. There will one drm_device for each card present
* in this family * in this family
*/ */
struct drm_device;
struct drm_driver { struct drm_driver {
int (*load) (struct drm_device *, unsigned long flags); int (*load) (struct drm_device *, unsigned long flags);
int (*firstopen) (struct drm_device *); int (*firstopen) (struct drm_device *);

2
drivers/char/drm/drm_ioctl.c
View File

@ -272,7 +272,7 @@ int drm_getstats(struct drm_device *dev, void *data,
struct drm_stats *stats = data; struct drm_stats *stats = data;
int i; int i;
memset(stats, 0, sizeof(stats)); memset(stats, 0, sizeof(*stats));
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);

8
drivers/char/drm/drm_os_linux.h
View File

@ -62,14 +62,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size)
#endif #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 */ /** Other copying of data to kernel space */
#define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \
copy_from_user(arg1, arg2, arg3) copy_from_user(arg1, arg2, arg3)

3
drivers/char/drm/savage_bci.c
View File

@ -968,9 +968,6 @@ static int savage_bci_event_wait(struct drm_device *dev, void *data, struct drm_
DRM_DEBUG("\n"); DRM_DEBUG("\n");
DRM_COPY_FROM_USER_IOCTL(event, (drm_savage_event_wait_t __user *) data,
sizeof(event));
UPDATE_EVENT_COUNTER(); UPDATE_EVENT_COUNTER();
if (dev_priv->status_ptr) if (dev_priv->status_ptr)
hw_e = dev_priv->status_ptr[1] & 0xffff; hw_e = dev_priv->status_ptr[1] & 0xffff;