Commit 97d9960f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents 6ab3532b 393815f5

drivers/acpi/osl.c

+1 −1
Original line number Diff line number Diff line
@@ -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__,