diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 10 | ||||
| -rw-r--r-- | include/linux/tboot.h | 1 |
2 files changed, 10 insertions, 1 deletions
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 *), | |||
| 371 | 371 | ||
| 372 | #endif /* !CONFIG_ACPI */ | 372 | #endif /* !CONFIG_ACPI */ |
| 373 | 373 | ||
| 374 | #ifdef CONFIG_ACPI | ||
| 375 | void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, | ||
| 376 | u32 pm1a_ctrl, u32 pm1b_ctrl)); | ||
| 377 | |||
| 378 | acpi_status acpi_os_prepare_sleep(u8 sleep_state, | ||
| 379 | u32 pm1a_control, u32 pm1b_control); | ||
| 380 | #else | ||
| 381 | #define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0) | ||
| 382 | #endif | ||
| 383 | |||
| 374 | #endif /*_LINUX_ACPI_H*/ | 384 | #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) | |||
| 143 | 143 | ||
| 144 | extern void tboot_probe(void); | 144 | extern void tboot_probe(void); |
| 145 | extern void tboot_shutdown(u32 shutdown_type); | 145 | extern void tboot_shutdown(u32 shutdown_type); |
| 146 | extern void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control); | ||
| 147 | extern struct acpi_table_header *tboot_get_dmar_table( | 146 | extern struct acpi_table_header *tboot_get_dmar_table( |
| 148 | struct acpi_table_header *dmar_tbl); | 147 | struct acpi_table_header *dmar_tbl); |
| 149 | extern int tboot_force_iommu(void); | 148 | extern int tboot_force_iommu(void); |
