tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Linus Torvalds 2658770b f8a9efb5

+1 -14
-2
drivers/char/drm/drmP.h
··· 559 559 * a family of cards. There will one drm_device for each card present 560 560 * in this family 561 561 */ 562 - struct drm_device; 563 - 564 562 struct drm_driver { 565 563 int (*load) (struct drm_device *, unsigned long flags); 566 564 int (*firstopen) (struct drm_device *);
+1 -1
drivers/char/drm/drm_ioctl.c
··· 272 272 struct drm_stats *stats = data; 273 273 int i; 274 274 275 - memset(stats, 0, sizeof(stats)); 275 + memset(stats, 0, sizeof(*stats)); 276 276 277 277 mutex_lock(&dev->struct_mutex); 278 278
-8
drivers/char/drm/drm_os_linux.h
··· 62 62 63 63 #endif 64 64 65 - /** For data going into the kernel through the ioctl argument */ 66 - #define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3) \ 67 - if ( copy_from_user(&arg1, arg2, arg3) ) \ 68 - return -EFAULT 69 - /** For data going from the kernel through the ioctl argument */ 70 - #define DRM_COPY_TO_USER_IOCTL(arg1, arg2, arg3) \ 71 - if ( copy_to_user(arg1, &arg2, arg3) ) \ 72 - return -EFAULT 73 65 /** Other copying of data to kernel space */ 74 66 #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ 75 67 copy_from_user(arg1, arg2, arg3)
-3
drivers/char/drm/savage_bci.c
··· 968 968 969 969 DRM_DEBUG("\n"); 970 970 971 - DRM_COPY_FROM_USER_IOCTL(event, (drm_savage_event_wait_t __user *) data, 972 - sizeof(event)); 973 - 974 971 UPDATE_EVENT_COUNTER(); 975 972 if (dev_priv->status_ptr) 976 973 hw_e = dev_priv->status_ptr[1] & 0xffff;