diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-02 17:59:53 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-02 17:59:53 +0100 |
| commit | 9cb31aa155bafd384b373fb91072fdb02aa35eaf (patch) | |
| tree | 403a494352dd734d28892de384d465273cdb97cc /drivers/acpi/acpica/acglobal.h | |
| parent | d5a8fb654c3bfc25d585802d2e63a5ccccd7a912 (diff) | |
| parent | 93792be6424aafd6fb59b2a1eef914ef9e91fdcb (diff) | |
Merge branch 'acpica'
Merge ACPICA updates for 5.16-rc1:
- Fix system-wide resume issue caused by evaluating control methods
too early in the resume path (Rafael Wysocki).
- Add support for Windows 2020 _OSI string (Mario Limonciello).
- Add Generic Port Affinity type for SRAT (Alison Schofield).
- Add disassembly support for the NHLT ACPI table (Bob Moore).
* acpica:
ACPICA: Update version to 20210930
ACPICA: iASL table disassembler: Added disassembly support for the NHLT ACPI table
ACPICA: ACPI 6.4 SRAT: add Generic Port Affinity type
ACPICA: Add support for Windows 2020 _OSI string
ACPICA: Avoid evaluating methods too early during system resume
Diffstat (limited to 'drivers/acpi/acpica/acglobal.h')
| -rw-r--r-- | drivers/acpi/acpica/acglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h index d41b810e367c..4366d36ef119 100644 --- a/drivers/acpi/acpica/acglobal.h +++ b/drivers/acpi/acpica/acglobal.h @@ -226,6 +226,8 @@ extern struct acpi_bit_register_info acpi_gbl_bit_register_info[ACPI_NUM_BITREG]; ACPI_GLOBAL(u8, acpi_gbl_sleep_type_a); ACPI_GLOBAL(u8, acpi_gbl_sleep_type_b); +ACPI_GLOBAL(u8, acpi_gbl_sleep_type_a_s0); +ACPI_GLOBAL(u8, acpi_gbl_sleep_type_b_s0); /***************************************************************************** * |