[kernel] r21857 - in dists/sid/linux/debian: . config/kernelarch-powerpc

[Aurelien Jarno]

Author: aurel32
Date: Tue Sep 16 18:31:23 2014
New Revision: 21857

Log:
Enable KVM_BOOK3S_64

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Tue Sep 16 17:52:59 2014	(r21856)
+++ dists/sid/linux/debian/changelog	Tue Sep 16 18:31:23 2014	(r21857)
@@ -25,8 +25,7 @@
 
   [ Aurelien Jarno ]
   * [powerpc/powerpc64,ppc64el] Backport more KVM patches from 3.17. Enable
-    KVM_BOOK3S_64_HV, KVM_BOOK3S_64_PR and KVM_XICS, but keep KVM_BOOK3S_64
-    disabled for now as it would trigger an ABI change (Partially addresses:
+    KVM_BOOK3S_64, KVM_BOOK3S_64_HV, KVM_BOOK3S_64_PR and KVM_XICS.  (Closes:
     #761656).
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 13 Sep 2014 22:28:05 +0100

Modified: dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64	Tue Sep 16 17:52:59 2014	(r21856)
+++ dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64	Tue Sep 16 18:31:23 2014	(r21857)
@@ -15,7 +15,7 @@
 ##
 ## file: arch/powerpc/kvm/Kconfig
 ##
-# CONFIG_KVM_BOOK3S_64 is not set
+CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=m
 CONFIG_KVM_BOOK3S_64_PR=m
 CONFIG_KVM_XICS=y