From 04734fa3865b70f623f9d5d806f3b172afa46228 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 5 Oct 2015 19:46:16 +0100
Subject: [PATCH] [arm64] Defer workaround for erratum #843419

---
 debian/changelog           | 2 +-
 debian/config/arm64/config | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index de39e67a6..2a49b4982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,6 @@ linux (4.2.3-1) UNRELEASED; urgency=medium
     - [arm64] entry: always restore x0 from the stack on syscall return
     - [arm64] flush FP/SIMD state correctly after execve()
     - [arm64] head.S: initialise mdcr_el2 in el2_setup
-    - [arm64] errata: add module build workaround for erratum #843419
     - [armhf,arm64] KVM: vgic: Check for !irqchip_in_kernel() when mapping
       resources (regression in 4.0)
     - [arm64] KVM: add workaround for Cortex-A57 erratum #852523
@@ -132,6 +131,7 @@ linux (4.2.3-1) UNRELEASED; urgency=medium
   * [!x86] net: Disable VMXNET3, only useful in VMware x86 virtual machines
   * netfilter: conntrack: use nf_ct_tmpl_free in CT/synproxy error paths
     (Closes: #800445)
+  * [arm64] Defer workaround for erratum #843419
 
   [ Salvatore Bonaccorso ]
   * ipc: Initialize msg/shm IPC objects before doing ipc_addid()
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index cc334960f..547d12977 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -4,6 +4,8 @@
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 CONFIG_PCI=y
+#. Until we decide how/whether to handle this in userland as well
+# CONFIG_ARM64_ERRATUM_843419 is not set
 CONFIG_SMP=y
 CONFIG_XEN=y
 CONFIG_COMPAT=y