svn commit: r189662 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/drm

[Robert Noland]

Author: rnoland
Date: Wed Mar 11 01:49:22 2009
New Revision: 189662
URL: http://svn.freebsd.org/changeset/base/189662

Log:
  Merge r189046
  
  There is no reason to hold the lock here.
  
  When I was LOCK_PROFILING this was pretty high up and there is no
  reason for it.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/drm/drm_drv.c

Modified: stable/7/sys/dev/drm/drm_drv.c
==============================================================================
--- stable/7/sys/dev/drm/drm_drv.c	Wed Mar 11 01:47:32 2009	(r189661)
+++ stable/7/sys/dev/drm/drm_drv.c	Wed Mar 11 01:49:22 2009	(r189662)
@@ -658,9 +658,7 @@ int drm_ioctl(struct cdev *kdev, u_long 
 	int is_driver_ioctl = 0;
 	struct drm_file *file_priv;
 
-	DRM_LOCK();
 	retcode = devfs_get_cdevpriv((void **)&file_priv);
-	DRM_UNLOCK();
 	if (retcode != 0) {
 		DRM_ERROR("can't find authenticator\n");
 		return EINVAL;