Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2658770b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents f8a9efb5 246a3d18

drivers/char/drm/drmP.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -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 *);

drivers/char/drm/drm_ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

drivers/char/drm/drm_os_linux.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -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)

drivers/char/drm/savage_bci.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -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;