diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-24 09:14:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-24 09:14:43 -0800 |
| commit | 84257ce6b798a0eed0b4637694137be941903cf7 (patch) | |
| tree | bcf903205724d5eda6d04f76898fdb6154c09992 | |
| parent | 9ec0de0ee0c9f0ffe4f72da9158194121cc22807 (diff) | |
| parent | f476893459318cb2eff3ecd2a05d4ceacf82e73e (diff) | |
| download | linux-84257ce6b798a0eed0b4637694137be941903cf7.tar.bz2 | |
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
| -rw-r--r-- | arch/x86/lguest/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig index 4a0890f815c4..08f41caada45 100644 --- a/arch/x86/lguest/Kconfig +++ b/arch/x86/lguest/Kconfig @@ -1,6 +1,6 @@ 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. |