rpms/kernel/F-11 shut-up-LOCK_TEST_WITH_RETURN.patch, NONE, 1.1 kernel.spec, 1.1770, 1.1771

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4142

Modified Files:
	kernel.spec 
Added Files:
	shut-up-LOCK_TEST_WITH_RETURN.patch 
Log Message:
* Wed Oct 21 2009 Kyle McMartin <kyle at redhat.com>
- shut-up-LOCK_TEST_WITH_RETURN.patch: sort out #445331... or paper bag
  over it for now until the lock warnings can be killed.


shut-up-LOCK_TEST_WITH_RETURN.patch:
 drmP.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE shut-up-LOCK_TEST_WITH_RETURN.patch ---
--- a/include/drm/drmP.h~	2009-10-21 00:07:36.000000000 -0400
+++ b/include/drm/drmP.h	2009-10-21 00:08:22.000000000 -0400
@@ -255,9 +255,10 @@
 do {									\
 	if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) ||		\
 	    file_priv->master->lock.file_priv != file_priv)	{			\
-		DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
-			   __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\
-			   file_priv->master->lock.file_priv, file_priv);		\
+		if (printk_ratelimit())							\
+			DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
+				   __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\
+				   file_priv->master->lock.file_priv, file_priv);		\
 		return -EINVAL;						\
 	}								\
 } while (0)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1770
retrieving revision 1.1771
diff -u -p -r1.1770 -r1.1771
--- kernel.spec	19 Oct 2009 16:19:42 -0000	1.1770
+++ kernel.spec	21 Oct 2009 05:53:43 -0000	1.1771
@@ -687,6 +687,7 @@ Patch1822: drm-dont-frob-i2c.patch
 Patch1824: drm-radeon-cs-oops-fix.patch
 Patch1825: drm-pnp-add-resource-range-checker.patch
 Patch1826: drm-i915-enable-mchbar.patch
+Patch1827: shut-up-LOCK_TEST_WITH_RETURN.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1430,6 +1431,7 @@ ApplyPatch drm-dont-frob-i2c.patch
 ApplyPatch drm-radeon-cs-oops-fix.patch
 ApplyPatch drm-pnp-add-resource-range-checker.patch
 ApplyPatch drm-i915-enable-mchbar.patch
+ApplyPatch shut-up-LOCK_TEST_WITH_RETURN.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -2122,6 +2124,10 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 21 2009 Kyle McMartin <kyle at redhat.com>
+- shut-up-LOCK_TEST_WITH_RETURN.patch: sort out #445331... or paper bag
+  over it for now until the lock warnings can be killed.
+
 * Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
 - af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
   rhbz#529626 local DoS.