diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-30 22:35:53 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 22:38:59 +0200 |
| commit | d326f44e5f2204c7a24db69bfc6dd3fe5f86182b (patch) | |
| tree | 21473db646b06fd462bbc8f3690732ba1bb2d018 /include | |
| parent | Merge branch 'd3' into release (diff) | |
| parent | Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-d326f44e5f2204c7a24db69bfc6dd3fe5f86182b.tar.xz linux-d326f44e5f2204c7a24db69bfc6dd3fe5f86182b.zip | |
Merge branch 'tboot' into release
Conflicts:
drivers/acpi/acpica/hwsleep.c
Text conflict between:
2feec47d4c5f80b05f1650f5a24865718978eea4
(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)
which removed #include "actables.h"
and
09f98a825a821f7a3f1b162f9ed023f37213a63b
(x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.)
which removed #include <linux/tboot.h>
The resolution is to remove them both.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acexcep.h | 1 | ||||
| -rw-r--r-- | include/linux/acpi.h | 10 | ||||
| -rw-r--r-- | include/linux/tboot.h | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index 47b3902957b0..92d6e1d701ff 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h @@ -57,6 +57,7 @@ #define ACPI_SUCCESS(a) (!(a)) #define ACPI_FAILURE(a) (a) +#define ACPI_SKIP(a) (a == AE_CTRL_SKIP) #define AE_OK (acpi_status) 0x0000 /* diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3f968665899b..104eda758e7f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -371,4 +371,14 @@ static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), #endif /* !CONFIG_ACPI */ +#ifdef CONFIG_ACPI +void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, + u32 pm1a_ctrl, u32 pm1b_ctrl)); + +acpi_status acpi_os_prepare_sleep(u8 sleep_state, + u32 pm1a_control, u32 pm1b_control); +#else +#define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0) +#endif + #endif /*_LINUX_ACPI_H*/ diff --git a/include/linux/tboot.h b/include/linux/tboot.h index 1dba6ee55203..c75128bed5fa 100644 --- a/include/linux/tboot.h +++ b/include/linux/tboot.h @@ -143,7 +143,6 @@ static inline int tboot_enabled(void) extern void tboot_probe(void); extern void tboot_shutdown(u32 shutdown_type); -extern void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control); extern struct acpi_table_header *tboot_get_dmar_table( struct acpi_table_header *dmar_tbl); extern int tboot_force_iommu(void); |