From 56937f92dbb25329d1f5fc184409aa4d4647ab12 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 3 Jun 2013 12:22:46 +0000 Subject: [PATCH] [x86] Enable HYPERVISOR_GUEST Various paravirtualisation options now depend on this. svn path=/dists/trunk/linux/; revision=20187 --- debian/changelog | 6 ++++++ debian/config/kernelarch-x86/config | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5e2e0c9c6..7d82b5ebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (3.10~rc4-1~exp2) UNRELEASED; urgency=low + + * [x86] Enable HYPERVISOR_GUEST + + -- Ben Hutchings Mon, 03 Jun 2013 13:21:56 +0100 + linux (3.10~rc4-1~exp1) experimental; urgency=low * New upstream release candidate diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 084593171..62cc55912 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -12,11 +12,12 @@ CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_KVM_GUEST=y +CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set # CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_KVM_GUEST=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_MEMTEST=y CONFIG_HPET_TIMER=y CONFIG_SCHED_SMT=y