[kernel/f19] Only enable ARM A15 errata on the LPAE kernel as it breaks A8

[Peter Robinson]

commit d4b4aa64a7bd8596d6885e15304876a2f4b85291
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Jun 28 08:55:34 2013 +0100

    Only enable ARM A15 errata on the LPAE kernel as it breaks A8

 config-armv7-generic |    2 +-
 config-armv7-lpae    |    3 +++
 kernel.spec          |    3 +++
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/config-armv7-generic b/config-armv7-generic
index 58c5816..d1e984f 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -70,7 +70,7 @@ CONFIG_ARM_ERRATA_775420=y
 CONFIG_PL310_ERRATA_753970=y
 CONFIG_PL310_ERRATA_769419=y
 # Cortex-A15
-CONFIG_ARM_ERRATA_798181=y
+# CONFIG_ARM_ERRATA_798181 is not set
 
 # generic that deviates from or should be merged into config-generic
 CONFIG_SMP=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 7e34ded..57d7d86 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -11,6 +11,9 @@ CONFIG_VIRTIO_CONSOLE=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_VIRTUALIZATION=y
 
+# Cortex-A15
+CONFIG_ARM_ERRATA_798181=y
+
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_MAX_VCPUS=8
diff --git a/kernel.spec b/kernel.spec
index 13bfcf1..17746d5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2367,6 +2367,9 @@ fi
 # and build.
 
 %changelog
+* Fri Jun 28 2013 Peter Robinson <pbrobinson at fedoraproject.org>
+- Only enable ARM A15 errata on the LPAE kernel as it breaks A8
+
 * Fri Jun 28 2013 Dave Airlie <airlied at redhat.com> 
 - add qxl fix for missing access ok macro.