diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
tree | 455e80aca7b57b17069fab252261c4dcae44374d /arch/mips/kvm | |
parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.gz linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.bz2 linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.zip |
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- fix build rules in binderfs sample
- fix build errors when Kbuild recurses to the top Makefile
- covert '---help---' in Kconfig to 'help'
* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
treewide: replace '---help---' in Kconfig files with 'help'
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'arch/mips/kvm')
-rw-r--r-- | arch/mips/kvm/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig index d697752a5723..2bf02d849a3a 100644 --- a/arch/mips/kvm/Kconfig +++ b/arch/mips/kvm/Kconfig @@ -6,7 +6,7 @@ source "virt/kvm/Kconfig" menuconfig VIRTUALIZATION bool "Virtualization" - ---help--- + help Say Y here to get to see options for using your Linux host to run other operating systems inside virtual machines (guests). This option alone does not add any kernel code. @@ -27,7 +27,7 @@ config KVM select KVM_MMIO select MMU_NOTIFIER select SRCU - ---help--- + help Support for hosting Guest kernels. choice @@ -37,7 +37,7 @@ choice config KVM_MIPS_TE bool "Trap & Emulate" - ---help--- + help Use trap and emulate to virtualize 32-bit guests in user mode. This does not require any special hardware Virtualization support beyond standard MIPS32/64 r2 or later, but it does require the guest kernel @@ -46,7 +46,7 @@ config KVM_MIPS_TE config KVM_MIPS_VZ bool "MIPS Virtualization (VZ) ASE" - ---help--- + help Use the MIPS Virtualization (VZ) ASE to virtualize guests. This supports running unmodified guest kernels (with CONFIG_KVM_GUEST=n), but requires hardware support. @@ -57,7 +57,7 @@ config KVM_MIPS_DYN_TRANS bool "KVM/MIPS: Dynamic binary translation to reduce traps" depends on KVM_MIPS_TE default y - ---help--- + help When running in Trap & Emulate mode patch privileged instructions to reduce the number of traps. @@ -66,7 +66,7 @@ config KVM_MIPS_DYN_TRANS config KVM_MIPS_DEBUG_COP0_COUNTERS bool "Maintain counters for COP0 accesses" depends on KVM - ---help--- + help Maintain statistics for Guest COP0 accesses. A histogram of COP0 accesses is printed when the VM is shutdown. |