Am Wednesday 04 March 2009 11:00:00 schrieb Jiri Kosina: > On Wed, 4 Mar 2009, Zoltan Boszormenyi wrote: > > >> diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c > > >> index 096e2a3..7c8b15b 100644 > > >> --- a/drivers/gpu/drm/drm_stub.c > > >> +++ b/drivers/gpu/drm/drm_stub.c > > >> @@ -168,7 +168,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; > > > > > > This is not a kind of patch that should be taken through trivial tree. > > > > You must mean this is exactly that kind of a patch... > > Notice the double mutex_lock() on the same mutex in the same scope. > > I try not to take urgent stuff through trivial tree, in order not to > bother Linus more than once per merge window with trivial stuff. > > I can of course take it, if DRM maintainers prefer it that way ...
well it *looked* trivial to me :) it would of course be nice to have it in 2.6.29 as it currently prevents drm[Set|Drop]Master from working, which is required for multiple X instances nowadays -- if it helps, I tested this exact scenario and the above appears to be the only showstopper Best regards -- Dipl. Math. Helge Bahmann Berater Geschäftsbereich Hochsicherheit secunet Security Networks AG Ammonstraße 74 01067 Dresden, Germany Fon: +49 201 54 54-3586 Fax: +49 201 54 54-1323 Email: helge.bahm...@secunet.com Sitz: Kronprinzenstraße 30, 45128 Essen Amtsgericht Essen HRB 13615 Vorstand: Dr. Rainer Baumgart, Thomas Koelzer, Thomas Pleines Aufsichtsratsvorsitzender: Dr. Karsten Ottenberg ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel