rpms/kernel/F-12 acpi-revert-attach-device-to-handle-early.patch, NONE, 1.1 kernel.spec, 1.1862, 1.1863

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	acpi-revert-attach-device-to-handle-early.patch 
Log Message:
Fix boot hang with ACPI on some systems.

acpi-revert-attach-device-to-handle-early.patch:
 scan.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

--- NEW FILE acpi-revert-attach-device-to-handle-early.patch ---
From: Len Brown <len.brown at intel.com>
Date: Sat, 5 Sep 2009 17:33:23 +0000 (-0400)
Subject: Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flenb%2Flinux-acpi-2.6.git;a=commitdiff_plain;h=f61f925859c57f6175082aeeee17743c68558a6e

Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"

This reverts commit eab4b645769fa2f8703f5a3cb0cc4ac090d347af.

http://bugzilla.kernel.org/show_bug.cgi?id=13002

Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 781435d..5dd702c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1264,16 +1264,6 @@ acpi_add_single_object(struct acpi_device **child,
 	acpi_device_set_id(device, parent, handle, type);
 
 	/*
-	 * The ACPI device is attached to acpi handle before getting
-	 * the power/wakeup/peformance flags. Otherwise OS can't get
-	 * the corresponding ACPI device by the acpi handle in the course
-	 * of getting the power/wakeup/performance flags.
-	 */
-	result = acpi_device_set_context(device, type);
-	if (result)
-		goto end;
-
-	/*
 	 * Power Management
 	 * ----------------
 	 */
@@ -1303,6 +1293,8 @@ acpi_add_single_object(struct acpi_device **child,
 			goto end;
 	}
 
+	if ((result = acpi_device_set_context(device, type)))
+		goto end;
 
 	result = acpi_device_register(device, parent);
 



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1862
retrieving revision 1.1863
diff -u -p -r1.1862 -r1.1863
--- kernel.spec	13 Oct 2009 00:39:38 -0000	1.1862
+++ kernel.spec	13 Oct 2009 00:47:16 -0000	1.1863
@@ -750,6 +750,8 @@ Patch14100: pci-increase-alignment-to-ma
 # fix resource counter issues on *big* machines
 Patch14101: improve-resource-counter-scalability.patch
 
+# fix boot hang on some systems
+Patch14200: acpi-revert-attach-device-to-handle-early.patch
 
 %endif
 
@@ -1399,6 +1401,9 @@ ApplyPatch pci-increase-alignment-to-mak
 
 ApplyPatch improve-resource-counter-scalability.patch
 
+# fix boot hang on some systems
+ApplyPatch acpi-revert-attach-device-to-handle-early.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2055,6 +2060,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-77
+- Fix boot hang with ACPI on some systems.
+
 * Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-76
 - Linux 2.6.31.4