rpms/kernel/devel drm-fix-setmaster-deadlock.patch, NONE, 1.1 kernel.spec, 1.1380, 1.1381

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv769

Modified Files:
	kernel.spec 
Added Files:
	drm-fix-setmaster-deadlock.patch 
Log Message:
* Wed Mar  4 2009  <krh at redhat.com>
- Add fix for deadlock in drm setmaster.


drm-fix-setmaster-deadlock.patch:

--- NEW FILE drm-fix-setmaster-deadlock.patch ---
>From 3b7d6997b09c2ca5f06e154375aafa92271966c2 Mon Sep 17 00:00:00 2001
From: Helge Bahmann <helge.bahmann at secunet.com>
Date: Wed, 4 Mar 2009 09:58:32 +0100
Subject: [PATCH] Fix deadlock in drm_setmaster_ioctl
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kristian Høgsberg <krh at redhat.com>
---
 drivers/gpu/drm/drm_stub.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 46bb923..0823b11 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -176,7 +176,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data,
 	    file_priv->minor->master != file_priv->master) {
 		mutex_lock(&dev->struct_mutex);
 		file_priv->minor->master = drm_master_get(file_priv->master);
-		mutex_lock(&dev->struct_mutex);
+		mutex_unlock(&dev->struct_mutex);
 	}
 
 	return 0;
-- 
1.6.1.3



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1380
retrieving revision 1.1381
diff -u -r1.1380 -r1.1381
--- kernel.spec	4 Mar 2009 17:55:48 -0000	1.1380
+++ kernel.spec	4 Mar 2009 18:06:30 -0000	1.1381
@@ -107,6 +107,7 @@
 %define with_doc 0
 %endif
 
+%define _with_baseonly 1
 # Additional options for user-friendly one-off kernel building:
 #
 # Only build the base kernel (--with baseonly):