diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-22 01:31:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-22 01:31:09 -0400 |
| commit | e840dfe334b4791af07aadee1b2cf3c7c7363581 (patch) | |
| tree | b0f8336f578cb6d3e39399f6714b8ec811536225 /drivers/acpi/acpica | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
| parent | a1f37788a6d8c037e7d92fe4a0fe9ec0d713b21e (diff) | |
Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into tboot
Diffstat (limited to 'drivers/acpi/acpica')
| -rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 3c4a922a9fc2..af702a7a69d9 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -43,9 +43,9 @@ */ #include <acpi/acpi.h> +#include <linux/acpi.h> #include "accommon.h" #include "actables.h" -#include <linux/tboot.h> #include <linux/module.h> #define _COMPONENT ACPI_HARDWARE @@ -344,8 +344,12 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) ACPI_FLUSH_CPU_CACHE(); - tboot_sleep(sleep_state, pm1a_control, pm1b_control); - + status = acpi_os_prepare_sleep(sleep_state, pm1a_control, + pm1b_control); + if (ACPI_SKIP(status)) + return_ACPI_STATUS(AE_OK); + if (ACPI_FAILURE(status)) + return_ACPI_STATUS(status); /* Write #2: Write both SLP_TYP + SLP_EN */ status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control); |