Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84257ce6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull lguest fixes from Rusty Russell:
 "Lguest weird config build fix, and update to the documentation"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  lguest: update help text.
  lguest: now depends on PCI
parents 9ec0de0e f4768934

arch/x86/lguest/Kconfig

+2 −2
Original line number Diff line number Diff line 
config LGUEST_GUEST

	bool "Lguest guest support"

	depends on X86_32 && PARAVIRT

	depends on X86_32 && PARAVIRT && PCI

	select TTY

	select VIRTUALIZATION

	select VIRTIO
@@ -8,7 +8,7 @@ config LGUEST_GUEST 
	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.

	  your kernel size by about 10k.  If in doubt, say N.



	  If you say Y here, make sure you say Y (or M) to the virtio block

	  and net drivers which lguest needs.