From 34b8867a034364ca33d0adb3a1c5b9982903c719 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 22 Oct 2007 11:01:54 +1000 Subject: Move lguest guest support to arch/x86. Lguest has two sides: host support (to launch guests) and guest support (replacement boot path and paravirt_ops). This moves the guest side to arch/x86/lguest where it's closer to related code. Signed-off-by: Rusty Russell Cc: Andi Kleen --- arch/i386/Kconfig | 10 ++-------- arch/i386/Makefile | 3 +++ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'arch/i386') diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 3523e82c8412..5bed8be34ba5 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -257,14 +257,8 @@ config VMI at the moment), by linking the kernel to a GPL-ed ROM module provided by the hypervisor. -config LGUEST_GUEST - bool "Lguest guest support" - select PARAVIRT - depends on !X86_PAE - help - Lguest is a tiny in-kernel hypervisor. Selecting this will - allow your kernel to boot under lguest. This option will increase - your kernel size by about 6k. If in doubt, say N. +source "arch/x86/lguest/Kconfig" + endif config ACPI_SRAT diff --git a/arch/i386/Makefile b/arch/i386/Makefile index b88e47ca3032..b81cb64d48e5 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -99,6 +99,9 @@ core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/ # Xen paravirtualization support core-$(CONFIG_XEN) += arch/x86/xen/ +# lguest paravirtualization support +core-$(CONFIG_LGUEST_GUEST) += arch/x86/lguest/ + # default subarch .h files mflags-y += -Iinclude/asm-x86/mach-default -- cgit v1.2.2