From: Will Deacon <will.deacon@arm.com>
Date: Mon, 26 Jun 2017 09:54:27 +0000 (+0100)
Subject: Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core
X-Git-Tag: v4.13-rc1~147^2~16
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb;p=linux-2.6-block.git

Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core

Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
---

3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb
diff --cc arch/arm64/Kconfig
index b37ac9b2a36b,80559977a83e..b52db8bb1270
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -20,8 -19,8 +20,9 @@@ config ARM6
  	select ARCH_HAS_STRICT_KERNEL_RWX
  	select ARCH_HAS_STRICT_MODULE_RWX
  	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ 	select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA
  	select ARCH_USE_CMPXCHG_LOCKREF
 +	select ARCH_SUPPORTS_MEMORY_FAILURE
  	select ARCH_SUPPORTS_ATOMIC_RMW
  	select ARCH_SUPPORTS_NUMA_BALANCING
  	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION