UBUNTU: (config) Update config for arm64 master changes

Changes to the master tree added ARCH_SUPPORTS_MEMORY_FAILURE
and CAVIUM_ERRATUM_30115 to the arm64 architecture. Following
those changes in the raspi2(/3) topic branch.

BugLink: https://bugs.launchpad.net/bugs/1696852
BugLink: https://bugs.launchpad.net/bugs/1673564
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 4894d1637287d930fab5d5a22772c342320a8ec0..9dd294db07451108f9555a41100b4b516f3f1f8f 100644 (file)
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -245,6 +245,7 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y
 # CONFIG_ARCH_SUNXI is not set
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -797,6 +798,7 @@ CONFIG_CARL9170_WPC=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
 # CONFIG_CAVIUM_ERRATUM_27456 is not set
+CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CC10001_ADC=m
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -3063,6 +3065,7 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMORY=y
 CONFIG_MEMORY_BALLOON=y
+# CONFIG_MEMORY_FAILURE is not set
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set