rpms/kernel/devel linux-2.6.11-firmware-timeout.patch, NONE, 1.1 kernel-2.6.spec, 1.1235, 1.1236

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23799

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.11-firmware-timeout.patch 
Log Message:
Add TIMEOUT to hotplug environment when requesting firmware (#153993)


linux-2.6.11-firmware-timeout.patch:
 firmware_class.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE linux-2.6.11-firmware-timeout.patch ---
>From foo at baz Tue Apr  9 12:12:43 2002
To: Greg KH <gregkh at suse.de>
Date: 17 Mar 2005 16:33:54 -08:00
From: kay.sievers at vrfy.org
Subject: [PATCH] add TIMEOUT to firmware_class hotplug event

On Tue, 2005-03-15 at 09:25 +0100, Hannes Reinecke wrote:
> The current implementation of the firmware class breaks a fundamental
> assumption in udevd: that the physical device can be initialised fully
> prior to executing the next event for that device.

Here we add a TIMEOUT value to the hotplug environment of the firmware
requesting event. I will adapt udevd not to wait for anything else, if
it finds a TIMEOUT key.

Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>


diff -Nru a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
--- a/drivers/base/firmware_class.c	2005-04-05 10:54:48 -07:00
+++ b/drivers/base/firmware_class.c	2005-04-05 10:54:48 -07:00
@@ -102,6 +102,9 @@
 	if (add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &len,
 			"FIRMWARE=%s", fw_priv->fw_id))
 		return -ENOMEM;
+	if (add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &len,
+			"TIMEOUT=%i", loading_timeout))
+		return -ENOMEM;
 
 	envp[i] = NULL;
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1235
retrieving revision 1.1236
diff -u -r1.1235 -r1.1236
--- kernel-2.6.spec	11 Apr 2005 13:01:23 -0000	1.1235
+++ kernel-2.6.spec	11 Apr 2005 16:10:08 -0000	1.1236
@@ -309,6 +309,7 @@
 Patch1720: linux-2.6.9-module_version.patch
 Patch1730: linux-2.6.9-spinlock-debug-panic.patch
 Patch1740: linux-2.6.11-default-elevator.patch
+Patch1750: linux-2.6.11-firmware-timeout.patch
 
 Patch2000: linux-2.6.11-vm-taint.patch
 Patch2001: linux-2.6.9-vm-oomkiller-debugging.patch
@@ -682,6 +683,8 @@
 %patch1730 -p1
 # Make CFQ default elevator again
 %patch1740 -p1
+# Add TIMEOUT to hotplug environment when requesting firmware
+%patch1750 -p1
 
 #
 # VM related fixes.
@@ -1105,6 +1108,10 @@
 %endif
 
 %changelog
+* Mon Apr 11 2005 David Woodhouse <dwmw2 at redhat.com>
+- Disable PPC cpufreq/sleep patches which make sleep less reliable
+- Add TIMEOUT to hotplug environment when requesting firmware (#153993)
+
 * Sun Apr 10 2005 Dave Jones <davej at redhat.com>
 - Integrate Roland McGrath's changes to make exec-shield
   and vdso play nicely together.