[PATCH] Ubuntu: [Config] enable EDAC_GHES for ARM64

[Manoj Iyer]

Enable CONFIG_EDAC_GHES option for ARM64,so that the memory errors
are processed and reported to the user space.

BugLink: http://launchpad.net/bugs/1747746

Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 1 +
 debian.master/config/annotations               | 2 +-
 debian.master/config/arm64/config.common.arm64 | 1 +
 debian.master/config/config.common.ubuntu      | 1 -
 debian.master/config/i386/config.common.i386   | 1 +
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c296d83756fa..07e663ecaad7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -90,6 +90,7 @@ CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+# CONFIG_EDAC_GHES is not set
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
 CONFIG_EFI_CAPSULE_LOADER=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 3646b10ba24c..855f37452dc2 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1240,7 +1240,7 @@ CONFIG_EDAC                                     policy<{'amd64': 'y', 'arm64': '
 CONFIG_EDAC_LEGACY_SYSFS                        policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_EDAC_DEBUG                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_EDAC_DECODE_MCE                          policy<{'amd64': 'm', 'i386': 'm'}>
-CONFIG_EDAC_GHES                                policy<{'amd64': 'n', 'arm64': 'n', 'i386': 'n'}>
+CONFIG_EDAC_GHES                                policy<{'amd64': 'n', 'arm64': 'y', 'i386': 'n'}>
 CONFIG_EDAC_AMD64                               policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_EDAC_AMD64_ERROR_INJECTION               policy<{'amd64': 'n', 'i386': 'n'}>
 CONFIG_EDAC_AMD76X                              policy<{'i386': 'm'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 9c612d1d410c..f93b268cd2ce 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -101,6 +101,7 @@ CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_GHES=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
 CONFIG_EFI_CAPSULE_LOADER=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f6289145d3cf..175dc5c564b9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2581,7 +2581,6 @@ CONFIG_EDAC_CPC925=m
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_E7XXX=m
-# CONFIG_EDAC_GHES is not set
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_I3000=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e1656138b648..c00869465bb4 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -86,6 +86,7 @@ CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+# CONFIG_EDAC_GHES is not set
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
 CONFIG_EFI_CAPSULE_LOADER=y
-- 
2.14.1