4 files changed, 30 insertions, 0 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index ae01d86070bb..707650ab77a7 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -85,4 +85,6 @@ source "drivers/auxdisplay/Kconfig"
 source "drivers/kvm/Kconfig"
 
 source "drivers/uio/Kconfig"
+
+source "drivers/lguest/Kconfig"
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index c34c8efff609..0ea8e3237c0d 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -73,6 +73,7 @@ obj-$(CONFIG_ISDN)		+= isdn/
 obj-$(CONFIG_EDAC)              += edac/
 obj-$(CONFIG_MCA)               += mca/
 obj-$(CONFIG_EISA)              += eisa/
+obj-$(CONFIG_LGUEST_GUEST)      += lguest/
 obj-$(CONFIG_CPU_FREQ)          += cpufreq/
 obj-$(CONFIG_MMC)               += mmc/
 obj-$(CONFIG_NEW_LEDS)          += leds/
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
new file mode 100644
index 000000000000..43d901fdc77f
--- /dev/null
+++ b/drivers/lguest/Kconfig
@@ -0,0 +1,20 @@
+config LGUEST
+        tristate "Linux hypervisor example code"
+        depends on X86 && PARAVIRT && NET && EXPERIMENTAL && !X86_PAE
+        select LGUEST_GUEST
+        select HVC_DRIVER
+        ---help---
+          This is a very simple module which allows you to run
+          multiple instances of the same Linux kernel, using the
+          "lguest" command found in the Documentation/lguest directory.
+          Note that "lguest" is pronounced to rhyme with "fell quest",
+          not "rustyvisor".  See Documentation/lguest/lguest.txt.
+
+          If unsure, say N.  If curious, say M.  If masochistic, say Y.
+
+config LGUEST_GUEST
+        bool
+        help
+          The guest needs code built-in, even if the host has lguest
+          support as a module.  The drivers are tiny, so we build them
+          in too.
diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile
new file mode 100644
index 000000000000..55382c7d799c
--- /dev/null
+++ b/drivers/lguest/Makefile
@@ -0,0 +1,7 @@
+# Guest requires the paravirt_ops replacement and the bus driver.
+obj-$(CONFIG_LGUEST_GUEST) += lguest.o lguest_asm.o lguest_bus.o
+
+# Host requires the other files, which can be a module.
+obj-$(CONFIG_LGUEST)    += lg.o
+lg-y := core.o hypercalls.o page_tables.o interrupts_and_traps.o \
+        segments.o io.o lguest_user.o switcher.o