rpms/kernel/F-11 acpi-revert-attach-device-to-handle-early.patch, NONE, 1.1 TODO, 1.73, 1.74 kernel.spec, 1.1760, 1.1761

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	TODO 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: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- TODO	6 Oct 2009 12:23:53 -0000	1.73
+++ TODO	13 Oct 2009 10:04:06 -0000	1.74
@@ -95,10 +95,6 @@
 	ACPI EC fixes from 2.6.32 (#492699, #525681)
 	Should go in F-12 and 2.6.31-stable too, once they're tested.
 
-* x86-dont-leak-64-bit-kernel-register-values.patch
-	x86 security fix (info leak)
-	Should go into F-12, will be in 2.6.31.3
-
 * linux-2.6-cfq-choose-new-next-req.patch
 	Fixes severe cfq performance problem when writing CDs.
 	Should go into F-12, needs to be sent for 2.6.31.x too.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1760
retrieving revision 1.1761
diff -u -p -r1.1760 -r1.1761
--- kernel.spec	12 Oct 2009 14:07:05 -0000	1.1760
+++ kernel.spec	13 Oct 2009 10:04:06 -0000	1.1761
@@ -785,6 +785,9 @@ Patch15500: ftrace-use-module-notifier-f
 Patch15510: ftrace-check-for-failure-for-all-conversions.patch
 Patch15520: tracing-correct-module-boundaries-for-ftrace_release.patch
 
+# fix boot hang on some systems
+Patch15600: acpi-revert-attach-device-to-handle-early.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1467,6 +1470,9 @@ ApplyPatch ftrace-use-module-notifier-fo
 ApplyPatch ftrace-check-for-failure-for-all-conversions.patch
 ApplyPatch tracing-correct-module-boundaries-for-ftrace_release.patch
 
+# fix boot hang on some systems
+ApplyPatch acpi-revert-attach-device-to-handle-early.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2055,6 +2061,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-82
+- Fix boot hang with ACPI on some systems.
+
 * Mon Oct 12 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-81
 - Critical ftrace fixes:
   ftrace-use-module-notifier-for-function-tracer.patch