summaryrefslogtreecommitdiffstats
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:35:16 -0400
commit634a74ca7b69a862f4bba90886bb616336739e66 (patch)
tree675cf502d0709e9863a60b8fd26af6ec16e8b70c
parent1f3eef073f24938c530cc3ee48917ae7fcca9f11 (diff)
downloadkernel-634a74ca7b69a862f4bba90886bb616336739e66.tar.gz
kernel-634a74ca7b69a862f4bba90886bb616336739e66.tar.xz
kernel-634a74ca7b69a862f4bba90886bb616336739e66.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>
-rw-r--r--config-x86-generic2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index ea3d44975..2ad965e6f 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -281,7 +281,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