summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-08 18:04:04 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-08 18:04:04 +0200
commit9a15da1b84c9907f1f491023c517aa79d1ea4958 (patch)
tree575bf0129d918d4b15dfad8aeddbfa2e7b1dda87 /include/acpi
parent2bfdb7b3e95b3c11cf1d1233dac7cb9c4394ec32 (diff)
parent85f94020033f931a5918ab26281b2afbe4d68b73 (diff)
downloadlinux-9a15da1b84c9907f1f491023c517aa79d1ea4958.tar.bz2
Merge back earlier ACPICA-related changes for 5.10.
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_io.h2
-rw-r--r--include/acpi/platform/aclinux.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h
index 12d8bd333fe7..027faa8883aa 100644
--- a/include/acpi/acpi_io.h
+++ b/include/acpi/acpi_io.h
@@ -21,7 +21,7 @@ void __iomem __ref
void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size);
void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
-int acpi_os_map_generic_address(struct acpi_generic_address *addr);
+void __iomem *acpi_os_map_generic_address(struct acpi_generic_address *addr);
void acpi_os_unmap_generic_address(struct acpi_generic_address *addr);
#endif
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 4098ba1d6599..72f52a1342a0 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -118,6 +118,10 @@
#define USE_NATIVE_ALLOCATE_ZEROED
+/* Use logical addresses for accessing GPE registers in system memory */
+
+#define ACPI_GPE_USE_LOGICAL_ADDRESSES
+
/*
* Overrides for in-kernel ACPICA
*/