diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 01:41:11 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 01:41:11 +0100 |
| commit | 794c33555f704047e4014d4601b3972cfbfe7e50 (patch) | |
| tree | 014bcdc36e4d1fbd3083dba8fae43993ec3a7084 /include/acpi | |
| parent | 28da43956b04d2bd854d8db3ab1883a223bee07d (diff) | |
| parent | ff1656790b3a4caca94505c52fd0250f981ea187 (diff) | |
| download | linux-next-794c33555f704047e4014d4601b3972cfbfe7e50.tar.gz | |
Merge branch 'acpi-pm'
* acpi-pm:
ACPI / PM: Fix acpi_pm_notifier_lock vs flush_workqueue() deadlock
ACPI / LPSS: Consolidate runtime PM and system sleep handling
ACPI / PM: Combine device suspend routines
ACPI / LPIT: Add Low Power Idle Table (LPIT) support
ACPI / PM: Split code validating need for runtime resume in ->prepare()
ACPI / PM: Restore acpi_subsys_complete()
ACPI / PM: Combine two identical device resume routines
ACPI / PM: Remove stale function header
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpiosxf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index c66eb8ffa454..d5c0f5153c4e 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -287,6 +287,8 @@ acpi_status acpi_os_write_port(acpi_io_address address, u32 value, u32 width); /* * Platform and hardware-independent physical memory interfaces */ +int acpi_os_read_iomem(void __iomem *virt_addr, u64 *value, u32 width); + #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_read_memory acpi_status acpi_os_read_memory(acpi_physical_address address, u64 *value, u32 width); |