diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-03-12 18:42:41 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-03-12 18:42:41 +0100 |
| commit | 97d9960f355cca99960eb44cd1bba1d7ba1073ee (patch) | |
| tree | 71bd7c8c52304d88d43f613b8c8b38bd16bb4b0d /drivers | |
| parent | 6ab3532b4c98f4e51969f0e5f3fc919c535f3ce1 (diff) | |
| parent | 393815f57651101f1590632092986d1d5a3a41bd (diff) | |
Merge branch 'acpi-osl'
Merge an ACPI OS services layer (OSL) fix that addresses sparse warnings
in acpi_os_initialize() (Ben Dooks)
* acpi-osl:
ACPI: OSL: fix __iomem type on return from acpi_os_map_generic_address()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/osl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 5b777316b9ac..62b9c83d4f20 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1681,7 +1681,7 @@ acpi_status __init acpi_os_initialize(void) * Use acpi_os_map_generic_address to pre-map the reset * register if it's in system memory. */ - void *rv; + void __iomem *rv; rv = acpi_os_map_generic_address(&acpi_gbl_FADT.reset_register); pr_debug("%s: Reset register mapping %s\n", __func__, |