From ef06cf88c723e91ea7708407dd3b726c24a01fc8 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 16 Sep 2014 18:31:23 +0000 Subject: [PATCH] Enable KVM_BOOK3S_64 svn path=/dists/sid/linux/; revision=21857 --- debian/changelog | 3 +-- debian/config/kernelarch-powerpc/config-arch-64 | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b57d73a5..75574799b 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 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 14875d9b7..c10c09477 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