From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jun 2015 23:16:21 +0000 (+0200)
Subject: Merge branches 'acpi-pm', 'acpi-apei', 'acpi-osl' and 'acpi-pci'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f1fd900c2bd0bf36832d489745b5f78847a1534;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'acpi-pm', 'acpi-apei', 'acpi-osl' and 'acpi-pci'

* acpi-pm:
  ACPI / PM: Add missing pm_generic_complete() invocation
  ACPI / PM: Turn power resources on and off in the right order during resume
  ACPI / PM: Rework device power management to follow ACPI 6
  ACPI / PM: Drop stale comment from acpi_power_transition()

* acpi-apei:
  GHES: Make NMI handler have a single reader
  GHES: Elliminate double-loop in the NMI handler
  GHES: Panic right after detection
  GHES: Carve out the panic functionality
  GHES: Carve out error queueing in a separate function

* acpi-osl:
  ACPI / osl: use same type for acpi_predefined_names values as in definition

* acpi-pci:
  ACPI / PCI: remove stale list_head in struct acpi_prt_entry
---

4f1fd900c2bd0bf36832d489745b5f78847a1534
diff --cc drivers/acpi/osl.c
index 5226a8b921ae,39748bb3a543,39748bb3a543,7a327b24df95,7ccba395c9dd..a3acd84f2533
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@@@@ -175,10 -175,14 -175,14 -175,14 -175,14 +175,10 @@@@@@ static void __init acpi_request_region 
     	if (!addr || !length)
     		return;
     
 ----	/* Resources are never freed */
 ----	if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
 ----		request_region(addr, length, desc);
 ----	else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
 ----		request_mem_region(addr, length, desc);
 ++++	acpi_reserve_region(addr, length, gas->space_id, 0, desc);
     }
     
 --- static int __init acpi_reserve_resources(void)
 +++ static void __init acpi_reserve_resources(void)
     {
     	acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length,
     		"ACPI PM1a_EVT_BLK");