From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 25 Jul 2016 11:41:01 +0000 (+0200)
Subject: Merge branch 'acpi-tables'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d5f017b796611c03d8b808d90eec0559c9049207;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'acpi-tables'

* acpi-tables:
  ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
  ACPI: add support for loading SSDTs via configfs
  ACPI: add support for configfs
  efi / ACPI: load SSTDs from EFI variables
  spi / ACPI: add support for ACPI reconfigure notifications
  i2c / ACPI: add support for ACPI reconfigure notifications
  ACPI: add support for ACPI reconfiguration notifiers
  ACPI / scan: fix enumeration (visited) flags for bus rescans
  ACPI / documentation: add SSDT overlays documentation
  ACPI: ARM64: support for ACPI_TABLE_UPGRADE
  ACPI / tables: introduce ARCH_HAS_ACPI_TABLE_UPGRADE
  ACPI / tables: move arch-specific symbol to asm/acpi.h
  ACPI / tables: table upgrade: refactor function definitions
  ACPI / tables: table upgrade: use cacheable map for tables

Conflicts:
	arch/arm64/include/asm/acpi.h
---

d5f017b796611c03d8b808d90eec0559c9049207
diff --cc arch/arm64/include/asm/acpi.h
index 4b13ecd3977a,c7aefc56dfdd..5420cb0fcb3e
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@@ -113,12 -113,6 +113,14 @@@ static inline const char *acpi_get_enab
  pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr);
  #endif
  
 +#ifdef CONFIG_ACPI_NUMA
 +int arm64_acpi_numa_init(void);
 +int acpi_numa_get_nid(unsigned int cpu, u64 hwid);
 +#else
 +static inline int arm64_acpi_numa_init(void) { return -ENOSYS; }
 +static inline int acpi_numa_get_nid(unsigned int cpu, u64 hwid) { return NUMA_NO_NODE; }
 +#endif /* CONFIG_ACPI_NUMA */
 +
+ #define ACPI_TABLE_UPGRADE_MAX_PHYS MEMBLOCK_ALLOC_ACCESSIBLE
+ 
  #endif /*_ASM_ACPI_H*/