[kernel] r20187 - in dists/trunk/linux/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Mon Jun  3 12:22:46 2013
New Revision: 20187

Log:
[x86] Enable HYPERVISOR_GUEST

Various paravirtualisation options now depend on this.

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Jun  3 12:14:09 2013	(r20186)
+++ dists/trunk/linux/debian/changelog	Mon Jun  3 12:22:46 2013	(r20187)
@@ -1,3 +1,9 @@
+linux (3.10~rc4-1~exp2) UNRELEASED; urgency=low
+
+  * [x86] Enable HYPERVISOR_GUEST
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 03 Jun 2013 13:21:56 +0100
+
 linux (3.10~rc4-1~exp1) experimental; urgency=low
 
   * New upstream release candidate

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Mon Jun  3 12:14:09 2013	(r20186)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Mon Jun  3 12:22:46 2013	(r20187)
@@ -12,11 +12,12 @@
 # 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