diff options
| author | Aurelien Jarno <aurel32@debian.org> | 2014-09-16 18:31:23 +0000 |
|---|---|---|
| committer | Aurelien Jarno <aurel32@debian.org> | 2014-09-16 18:31:23 +0000 |
| commit | ef06cf88c723e91ea7708407dd3b726c24a01fc8 (patch) | |
| tree | 95fcc0931f1e46794538613d9ad73087a5597e40 | |
| parent | 782d644da7ab74e04bfebd30b66c264654028da3 (diff) | |
| download | kernel_replicant_linux-ef06cf88c723e91ea7708407dd3b726c24a01fc8.tar.gz kernel_replicant_linux-ef06cf88c723e91ea7708407dd3b726c24a01fc8.tar.bz2 kernel_replicant_linux-ef06cf88c723e91ea7708407dd3b726c24a01fc8.zip | |
Enable KVM_BOOK3S_64
svn path=/dists/sid/linux/; revision=21857
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/kernelarch-powerpc/config-arch-64 | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 0b57d73a5eec..75574799b4f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,7 @@ linux (3.16.2-4) UNRELEASED; urgency=medium [ 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@decadent.org.uk> Sat, 13 Sep 2014 22:28:05 +0100 diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64 index 14875d9b7a74..c10c094778d1 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64 +++ b/debian/config/kernelarch-powerpc/config-arch-64 @@ -15,7 +15,7 @@ CONFIG_KERNEL_START=0xc000000000000000 ## ## 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 |