rpms/kernel-xen-2.6/F-7 linux-2.6-acpi-config_pm-poweroff.patch, NONE, 1.1 kernel-xen.spec, 1.29, 1.30

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-acpi-config_pm-poweroff.patch 
Log Message:
Fix for bug #241381: enable ACPI poweroff even with CONFIG_PM disabled



linux-2.6-acpi-config_pm-poweroff.patch:

--- NEW FILE linux-2.6-acpi-config_pm-poweroff.patch ---
>From b7da11fc422b5d06ab6ed5444a1f01ac0e805c74 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Tue, 10 Jul 2007 19:02:14 -0300
Subject: [PATCH] Remove #ifdef CONFIG_PM from ACPI power-off code

The ACPI poweroff code is inside a #ifdef CONFIG_PM, that was added on
commit b35c67a46b025e8dc320b59fbe5c283094e1d7f5. It is not necessary
because the poweroff code compiles and works even with CONFIG_PM disabled.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 drivers/acpi/sleep/poweroff.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
index d9801ef..5d6ba10 100644
--- a/drivers/acpi/sleep/poweroff.c
+++ b/drivers/acpi/sleep/poweroff.c
@@ -37,8 +37,6 @@ #endif
 	return 0;
 }
 
-#ifdef CONFIG_PM
-
 void acpi_power_off(void)
 {
 	/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
@@ -94,5 +92,3 @@ static int acpi_poweroff_init(void)
 }
 
 late_initcall(acpi_poweroff_init);
-
-#endif				/* CONFIG_PM */
-- 
silverbrick.install.2006.08.14-dirty



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kernel-xen.spec	11 Jun 2007 18:59:12 -0000	1.29
+++ kernel-xen.spec	11 Jul 2007 17:33:54 -0000	1.30
@@ -471,6 +471,7 @@
 Patch2203: linux-2.6-sata-pata-piix3.patch
 
 # ACPI bits
+Patch3000: linux-2.6-acpi-config_pm-poweroff.patch
 
 # Add the new firewire stack. Diff between the v2.6.20 tag and commit
 # 5468ee91741092a711327628c7c524a4d4d0cd6a in the linux1394 git tree.
@@ -1052,6 +1053,7 @@
 %patch2203 -p1
 
 # ACPI patches
+%patch3000 -p1
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
@@ -2019,6 +2021,9 @@
 #  - tux.
 
 %changelog
+* Wed Jul 11 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Remove #ifdef CONFIG_PM from acpi poweroff code (fix bug #241381)
+
 * Mon Jun 11 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Added fix to bug #243756: linux-2.6-xen-fix-nosegneg-detection.patch