diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-02-15 15:14:19 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-02-15 15:14:19 +0100 |
| commit | 391712d7536ddba783b10ed4e67447970c3827ae (patch) | |
| tree | 92671d90158da2f6921cd19da680a859e0476aa1 /include/acpi | |
| parent | fda7be2068973195343d14c1f760adcd481455c9 (diff) | |
| parent | 5a9e358f1d1f5a2c2dfd8055b0e9e44d58a54a49 (diff) | |
Merge branch 'acpica'
Merge ACPICA changes for 6.3-rc1:
- Drop port I/O validation for some regions to avoid AML failures due
to rejections of legitimate port I/O writes (Mario Limonciello).
- Constify acpi_get_handle() pathname argument to allow its callers to
pass conts pathnames to it (Sakari Ailus).
- Prevent acpi_ns_simple_repair() from crashing in some cases when
AE_AML_NO_RETURN_VALUE should be returned (Daniil Tatianin).
- Fix typo in CDAT DSMAS struct definition (Lukas Wunner).
* acpica:
ACPICA: Fix typo in CDAT DSMAS struct definition
ACPICA: nsrepair: handle cases without a return value correctly
ACPICA: Constify pathname argument for acpi_get_handle()
ACPICA: Drop port I/O validation for some regions
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
| -rw-r--r-- | include/acpi/actbl1.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 9778408f8db4..8e364cbdd14a 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -526,7 +526,7 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status struct acpi_buffer *ret_path_ptr)) ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_get_handle(acpi_handle parent, - acpi_string pathname, + const char *pathname, acpi_handle *ret_handle)) ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_attach_data(acpi_handle object, diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 4175dce3967c..e8297cefde09 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -344,7 +344,7 @@ enum acpi_cdat_type { /* Subtable 0: Device Scoped Memory Affinity Structure (DSMAS) */ -struct acpi_cadt_dsmas { +struct acpi_cdat_dsmas { u8 dsmad_handle; u8 flags; u16 reserved; |