Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (41 commits)
  ACPICA: hw: Don't carry spinlock over suspend
  ACPICA: hw: remove use_lock flag from acpi_hw_register_{read, write}
  ACPI: cpuidle: port idle timer suspend/resume workaround to cpuidle
  ACPI: clean up acpi_enter_sleep_state_prep
  Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish
  ACPI: suppress uninitialized var warning
  cpuidle: consolidate 2.6.22 cpuidle branch into one patch
  ACPI: thinkpad-acpi: skip blanks before the data when parsing sysfs
  ACPI: AC: Add sysfs interface
  ACPI: SBS: Add sysfs alarm
  ACPI: SBS: Add ACPI_PROCFS around procfs handling code.
  ACPI: SBS: Add support for power_supply class (and sysfs)
  ACPI: SBS: Make SBS reads table-driven.
  ACPI: SBS: Simplify data structures in SBS
  ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002)
  ACPI: EC: Add new query handler to list head.
  ACPI: Add acpi_bus_generate_event4() function
  ACPI: Battery: add sysfs alarm
  ACPI: Battery: Add sysfs support
  ACPI: Battery: Misc clean-ups, no functional changes
  ...

Fix up conflicts in drivers/misc/thinkpad_acpi.[ch] manually

3 files changed, 45 insertions, 79 deletions

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 048295ec3707..f3d3867303ec 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -44,7 +44,6 @@ int acpi_sleep_prepare(u32 acpi_state)
         ACPI_FLUSH_CPU_CACHE();
         acpi_enable_wakeup_device_prep(acpi_state);
 #endif
-        acpi_gpe_sleep_prepare(acpi_state);
         acpi_enter_sleep_state_prep(acpi_state);
         return 0;
 }
@@ -268,6 +267,11 @@ static void acpi_hibernation_leave(void)
 
 static void acpi_hibernation_finish(void)
 {
+        /*
+         * If ACPI is not enabled by the BIOS and the boot kernel, we need to
+         * enable it here.
+         */
+        acpi_enable();
         acpi_leave_sleep_state(ACPI_STATE_S4);
         acpi_disable_wakeup_device(ACPI_STATE_S4);
 
diff --git a/drivers/acpi/sleep/sleep.h b/drivers/acpi/sleep/sleep.h
index ff1f8504f497..a2ea125ae2d0 100644
--- a/drivers/acpi/sleep/sleep.h
+++ b/drivers/acpi/sleep/sleep.h
@@ -5,6 +5,5 @@ extern int acpi_suspend (u32 state);
 extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
 extern void acpi_enable_wakeup_device(u8 sleep_state);
 extern void acpi_disable_wakeup_device(u8 sleep_state);
-extern void acpi_gpe_sleep_prepare(u32 sleep_state);
 
 extern int acpi_sleep_prepare(u32 acpi_state);
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index 97c27ddb144d..ed8e41becf0c 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -64,36 +64,29 @@ void acpi_enable_wakeup_device(u8 sleep_state)
         ACPI_FUNCTION_TRACE("acpi_enable_wakeup_device");
         spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-                struct acpi_device *dev = container_of(node,
-                                                       struct acpi_device,
-                                                       wakeup_list);
-
+                struct acpi_device *dev =
+                        container_of(node, struct acpi_device, wakeup_list);
+                if (!dev->wakeup.flags.valid)
+                        continue;
                 /* If users want to disable run-wake GPE,
                  * we only disable it for wake and leave it for runtime
                  */
-                if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                        spin_unlock(&acpi_device_lock);
-                        acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                          dev->wakeup.gpe_number,
-                                          ACPI_GPE_TYPE_RUNTIME);
-                        /* Re-enable it, since set_gpe_type will disable it */
-                        acpi_enable_gpe(dev->wakeup.gpe_device,
-                                        dev->wakeup.gpe_number, ACPI_ISR);
-                        spin_lock(&acpi_device_lock);
+                if (!dev->wakeup.state.enabled ||
+                    sleep_state > (u32) dev->wakeup.sleep_state) {
+                        if (dev->wakeup.flags.run_wake) {
+                                spin_unlock(&acpi_device_lock);
+                                /* set_gpe_type will disable GPE, leave it like that */
+                                acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                                  dev->wakeup.gpe_number,
+                                                  ACPI_GPE_TYPE_RUNTIME);
+                                spin_lock(&acpi_device_lock);
+                        }
                         continue;
                 }
-
-                if (!dev->wakeup.flags.valid ||
-                    !dev->wakeup.state.enabled ||
-                    (sleep_state > (u32) dev->wakeup.sleep_state))
-                        continue;
-
                 spin_unlock(&acpi_device_lock);
-                /* run-wake GPE has been enabled */
                 if (!dev->wakeup.flags.run_wake)
                         acpi_enable_gpe(dev->wakeup.gpe_device,
                                         dev->wakeup.gpe_number, ACPI_ISR);
-                dev->wakeup.state.active = 1;
                 spin_lock(&acpi_device_lock);
         }
         spin_unlock(&acpi_device_lock);
@@ -112,26 +105,25 @@ void acpi_disable_wakeup_device(u8 sleep_state)
 
         spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-                struct acpi_device *dev = container_of(node,
-                                                       struct acpi_device,
-                                                       wakeup_list);
+                struct acpi_device *dev =
+                        container_of(node, struct acpi_device, wakeup_list);
 
-                if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                        spin_unlock(&acpi_device_lock);
-                        acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                          dev->wakeup.gpe_number,
-                                          ACPI_GPE_TYPE_WAKE_RUN);
-                        /* Re-enable it, since set_gpe_type will disable it */
-                        acpi_enable_gpe(dev->wakeup.gpe_device,
-                                        dev->wakeup.gpe_number, ACPI_NOT_ISR);
-                        spin_lock(&acpi_device_lock);
+                if (!dev->wakeup.flags.valid)
                         continue;
-                }
-
-                if (!dev->wakeup.flags.valid ||
-                    !dev->wakeup.state.active ||
-                    (sleep_state > (u32) dev->wakeup.sleep_state))
+                if (!dev->wakeup.state.enabled ||
+                    sleep_state > (u32) dev->wakeup.sleep_state) {
+                        if (dev->wakeup.flags.run_wake) {
+                                spin_unlock(&acpi_device_lock);
+                                acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                                  dev->wakeup.gpe_number,
+                                                  ACPI_GPE_TYPE_WAKE_RUN);
+                                /* Re-enable it, since set_gpe_type will disable it */
+                                acpi_enable_gpe(dev->wakeup.gpe_device,
+                                                dev->wakeup.gpe_number, ACPI_NOT_ISR);
+                                spin_lock(&acpi_device_lock);
+                        }
                         continue;
+                }
 
                 spin_unlock(&acpi_device_lock);
                 acpi_disable_wakeup_device_power(dev);
@@ -142,7 +134,6 @@ void acpi_disable_wakeup_device(u8 sleep_state)
                         acpi_clear_gpe(dev->wakeup.gpe_device,
                                        dev->wakeup.gpe_number, ACPI_NOT_ISR);
                 }
-                dev->wakeup.state.active = 0;
                 spin_lock(&acpi_device_lock);
         }
         spin_unlock(&acpi_device_lock);
@@ -160,48 +151,20 @@ static int __init acpi_wakeup_device_init(void)
                 struct acpi_device *dev = container_of(node,
                                                        struct acpi_device,
                                                        wakeup_list);
-
                 /* In case user doesn't load button driver */
-                if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                        spin_unlock(&acpi_device_lock);
-                        acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                          dev->wakeup.gpe_number,
-                                          ACPI_GPE_TYPE_WAKE_RUN);
-                        acpi_enable_gpe(dev->wakeup.gpe_device,
-                                        dev->wakeup.gpe_number, ACPI_NOT_ISR);
-                        dev->wakeup.state.enabled = 1;
-                        spin_lock(&acpi_device_lock);
-                }
+                if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
+                        continue;
+                spin_unlock(&acpi_device_lock);
+                acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                  dev->wakeup.gpe_number,
+                                  ACPI_GPE_TYPE_WAKE_RUN);
+                acpi_enable_gpe(dev->wakeup.gpe_device,
+                                dev->wakeup.gpe_number, ACPI_NOT_ISR);
+                dev->wakeup.state.enabled = 1;
+                spin_lock(&acpi_device_lock);
         }
         spin_unlock(&acpi_device_lock);
-
         return 0;
 }
 
 late_initcall(acpi_wakeup_device_init);
-
-/*
- * Disable all wakeup GPEs before entering requested sleep state.
- *      @sleep_state:   ACPI state
- * Since acpi_enter_sleep_state() will disable all
- * RUNTIME GPEs, we simply mark all GPES that
- * are not enabled for wakeup from requested state as RUNTIME.
- */
-void acpi_gpe_sleep_prepare(u32 sleep_state)
-{
-        struct list_head *node, *next;
-
-        list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-                struct acpi_device *dev = container_of(node,
-                                                       struct acpi_device,
-                                                       wakeup_list);
-
-                /* The GPE can wakeup system from this state, don't touch it */
-                if ((u32) dev->wakeup.sleep_state >= sleep_state)
-                        continue;
-                /* acpi_set_gpe_type will automatically disable GPE */
-                acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                  dev->wakeup.gpe_number,
-                                  ACPI_GPE_TYPE_RUNTIME);
-        }
-}