r1631 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Andres Salomon]

Author: dilinger-guest
Date: 2004-09-23 08:53:34 -0600 (Thu, 23 Sep 2004)
New Revision: 1631

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/alsa-module-load-fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7
Log:
  * Fix ALSA module locking issue (closes: #259056) (Andres Salomon).


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-23 00:41:25 UTC (rev 1630)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-23 14:53:34 UTC (rev 1631)
@@ -17,6 +17,8 @@
   
   * Update forcedeth driver to fix autoneg on 100Mbit cards (Christoph Hellwig).
 
+  * Fix ALSA module locking issue (closes: #259056) (Andres Salomon).
+
  -- Jens Schmalzing <jensen@debian.org>  Thu, 16 Sep 2004 10:04:54 +0200
 
 kernel-source-2.6.8 (2.6.8-6) unstable; urgency=medium

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/alsa-module-load-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/alsa-module-load-fix.dpatch	2004-09-23 00:41:25 UTC (rev 1630)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/alsa-module-load-fix.dpatch	2004-09-23 14:53:34 UTC (rev 1631)
@@ -0,0 +1,50 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [ALSA]  suppress auto-loading of modules in module_init().
+## DP: Patch author: Takashi Iwai <tiwai@suse.de>
+## DP: Upstream status: currently in -mm tree, not yet in linus'.
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/09/06 20:18:03+02:00 perex@suse.cz 
+#   [ALSA]  suppress auto-loading of modules in module_init().
+#   
+#   ALSA sequencer
+#   The auto-loading of sequencer modules is suppressed in module_init().
+#   The recent module-init-tools may cause blocking.
+#   
+#   Signed-off-by: Takashi Iwai <tiwai@suse.de>
+# 
+# sound/core/seq/seq_clientmgr.c
+#   2004/09/01 14:25:27+02:00 perex@suse.cz +4 -1
+#   [ALSA]  suppress auto-loading of modules in module_init().
+#   
+#   D:2004/09/01 20:25:27
+#   C:ALSA sequencer
+#   F:core/seq/seq_clientmgr.c:1.34->1.35 
+#   L:The auto-loading of sequencer modules is suppressed in module_init().
+#   L:The recent module-init-tools may cause blocking.
+#   Signed-off-by: Takashi Iwai <tiwai@suse.de>
+# 
+diff -Nru a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
+--- a/sound/core/seq/seq_clientmgr.c	2004-09-21 21:03:33 -07:00
++++ b/sound/core/seq/seq_clientmgr.c	2004-09-21 21:03:33 -07:00
+@@ -156,7 +156,10 @@
+ 					card_requested[card] = 1;
+ 					snd_request_card(card);
+ 				}
+-				snd_seq_device_load_drivers();
++				/* FIXME: may cause blocking when called from
++				 * module_init(), so disable this feature
++				 */
++				/* snd_seq_device_load_drivers(); */
+ 			}
+ 		}
+ 		spin_lock_irqsave(&clients_lock, flags);
+

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7	2004-09-23 00:41:25 UTC (rev 1630)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7	2004-09-23 14:53:34 UTC (rev 1631)
@@ -5,3 +5,4 @@
 + ata_piix-combinde-mode-fix.dpatch
 + tg3-update.dpatch
 + forcedeth-update.dpatch
++ alsa-module-load-fix.dpatch