summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2016-04-14 12:48:59 +0200
committerJosh Boyer <jwboyer@fedoraproject.org>2016-05-31 08:34:09 -0400
commitea0cab1042216dd6d75fbe9397020c347c474aa6 (patch)
tree909f1b30ee8f72952233d99268f83916f488fab6 /config-x86-generic
parent4323a8b61b2d11e7b0098cce050099087248f7d0 (diff)
downloadkernel-ea0cab1042216dd6d75fbe9397020c347c474aa6.tar.gz
kernel-ea0cab1042216dd6d75fbe9397020c347c474aa6.tar.xz
kernel-ea0cab1042216dd6d75fbe9397020c347c474aa6.zip
config: x86: stop pretending to be an Lguest guest
Ever since v2.6.36 there's a conflict between OLPC support and Lguest guest support: a kernel image can't both support booting OLPC x86 hardware and booting as an Lguest guest. Booting a kernel image that tries to do both as an Lguest guest will fail with lguest: Reinjecting trap 13 for fault at 0x1000062: Invalid argument This means that people wanting to boot an Lguest guest on 32 bits x86 needed to build their own kernel image without OLPC support since, it seems, Fedora 15. So let's stop pretending to support being an Lguest guest. People wanting to have that will now not only have to disable CONFIG_OLPC but also enable CONFIG_LGUEST_GUEST. (A second order effect is that both CONFIG_VIRTIO and CONFIG_VIRTIO_CONSOLE will change from 'y' to 'm' in our builds. Assuming a sane build system no one should notice. We'll see.) Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index bc40117b3..12ac67f17 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -286,7 +286,7 @@ CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_KVM_DEVICE_ASSIGNMENT=y
CONFIG_LGUEST=m
-CONFIG_LGUEST_GUEST=y
+# CONFIG_LGUEST_GUEST is not set
CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y