UBUNTU: [Config] CONFIG_ARM64_ERRATUM_845719=y

BugLink: http://bugs.launchpad.net/bugs/1647793
Looks this option is missed in Yakkety, and should have been
enabled. It is enabled on Xenial, and used for workaround
the issue of "Cortex-A53: 845719: a load might read incorrect data".

Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 0240e1fc8d852134a8d796e7e99d0832c24ae8dc..0a04899d69386059a65c80d21eb3def0fe5eaf74 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11157,3 +11157,7 @@ CONFIG_APPLDATA_NET_SUM                         policy<{'s390x': 'm'}>
 #CONFIG_TOUCHSCREEN_EETI                               p policy<(arch armel armhf &/ value n) | value m> flag<BUILD FAILURE> note<FTBS on ti-omap4>
 #CONFIG_SENSORS_AK8975                         p policy<(arch armel armhf &/ value n) | value m> flag<BUILD FAILURE> note<FTBS on ti-omap4>
 #CONFIG_PPC_EPAPR_HV_BYTECHAN                  n flag<BUILD FAILURE> note<FTBFS on ppc64el>
+
+CONFIG_ARM64_ERRATUM_843419                    policy<{'arm64': 'y'}>
+#
+CONFIG_ARM64_ERRATUM_843419                    mark<ENFORCED> note<LP#1647793>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 71d68f012eb3e2c4727d77d32ea66499a9782380..1cadfe220cdb2b5ac198984e51a716b5272ba993 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -512,7 +512,7 @@ CONFIG_ARM64_ERRATUM_826319=y
 CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
-# CONFIG_ARM64_ERRATUM_843419 is not set
+CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_HW_AFDBM=y
 # CONFIG_ARM64_LSE_ATOMICS is not set