summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-powerpc64-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index e0067f5e5..ce547a8d2 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -82,7 +82,7 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
CONFIG_CRYPTO_DEV_NX_COMPRESS_CRYPTO=m
CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DEV_VMX_ENCRYPT=y
+# CONFIG_CRYPTO_DEV_VMX_ENCRYPT is not set
CONFIG_XZ_DEC_POWERPC=y
diff --git a/kernel.spec b/kernel.spec
index d1c7d97f1..97448d432 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2019,6 +2019,9 @@ fi
#
#
%changelog
+* Thu Jul 30 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable CRYPTO_DEV_VMX_ENCRYPT on PPC for now to fix Power 8 boot (rhbz 1237089)
+
* Wed Jul 29 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc4.git2.1
- Linux v4.2-rc4-53-g956325bd55bb