linux/drivers/acpi/sleep.c, branch v2.6.39-rc2

Merge branch 'linus' into release

2011-03-23T06:34:54Z

Conflicts: arch/x86/kernel/acpi/sleep.c Signed-off-by: Len Brown

Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-03-16T17:10:02Z

* 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix binutils-2.21 symbol related build failures x86-64, trampoline: Remove unused variable x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot x86, reboot: Move the real-mode reboot code to an assembly file x86: Make the GDT_ENTRY() macro in safe for assembly x86, trampoline: Use the unified trampoline setup for ACPI wakeup x86, trampoline: Common infrastructure for low memory trampolines Fix up trivial conflicts in arch/x86/kernel/Makefile

PM: Remove CONFIG_PM_OPS

2011-03-14T23:43:15Z

After redefining CONFIG_PM to depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME) the CONFIG_PM_OPS option is redundant and can be replaced with CONFIG_PM. Signed-off-by: Rafael J. Wysocki

ACPI / PM: acpi_hibernation_enter() need not switch interrupts off

2011-02-24T18:58:55Z

The function acpi_hibernation_enter() is always called with interrupts off, so it doesn't need to switch them off and on. Signed-off-by: Rafael J. Wysocki

ACPI / PM: Merge do_suspend_lowlevel() into acpi_save_state_mem()

2011-02-24T18:58:54Z

The function do_suspend_lowlevel() is specific to x86 and defined in assembly code, so it should be called from the x86 low-level suspend code rather than from acpi_suspend_enter(). Merge do_suspend_lowlevel() into the x86's acpi_save_state_mem() and change the name of the latter to acpi_suspend_lowlevel(), so that the function's purpose is better reflected by its name. Signed-off-by: Rafael J. Wysocki

ACPI / PM: Call acpi_save_state_mem() right before low-level suspend

2011-02-24T18:58:54Z

Since acpi_save_state_mem() is only called by acpi_suspend_enter() if the target sleep state is S3, it's better to call it under the switch (acpi_state), right before do_suspend_lowlevel(). Signed-off-by: Rafael J. Wysocki

ACPI / PM: Modify the "low-level resume finished" message

2011-02-24T18:58:54Z

Move the low-level resume completion message to the point where control goes back to acpi_suspend_enter() during resume and change it so that it's more informative. Signed-off-by: Rafael J. Wysocki

ACPI / PM: acpi_suspend_enter() need not switch interrupts off

2011-02-24T18:58:54Z

The function acpi_suspend_enter() is always called with interrupts off, so it doesn't need to switch them off and on. Signed-off-by: Rafael J. Wysocki

ACPI / PM: Drop acpi_restore_state_mem()

2011-02-24T18:58:54Z

The function acpi_restore_state_mem() has never been and most likely never will be used, so remove it. Signed-off-by: Rafael J. Wysocki

x86, trampoline: Use the unified trampoline setup for ACPI wakeup

2011-02-18T05:05:06Z

Use the unified trampoline allocation setup to allocate and install the ACPI wakeup code in low memory. Signed-off-by: H. Peter Anvin LKML-Reference: <4D5DFBE4.7090104@intel.com> Cc: Rafael J. Wysocki Cc: Matthieu Castet Cc: Stephen Rothwell