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/arm64 | |
parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) |
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/arm64')
-rw-r--r-- | arch/arm64/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm64/kvm/Kconfig | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 8a46ed3ab429..31380da53689 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1035,7 +1035,7 @@ config CC_HAVE_SHADOW_CALL_STACK config SECCOMP bool "Enable seccomp to safely compute untrusted bytecode" - ---help--- + help This kernel feature is useful for number crunching applications that may need to compute untrusted bytecode during their execution. By using pipes or other transports made available to @@ -1068,7 +1068,7 @@ config KEXEC depends on PM_SLEEP_SMP select KEXEC_CORE bool "kexec system call" - ---help--- + help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot but it is independent of the system firmware. And like a reboot diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index f1c1f981482c..13489aff4440 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -7,7 +7,7 @@ source "virt/lib/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. @@ -40,7 +40,7 @@ menuconfig KVM select HAVE_KVM_VCPU_RUN_PID_CHANGE select TASKSTATS select TASK_DELAY_ACCT - ---help--- + help Support hosting virtualized guest machines. If unsure, say N. @@ -53,7 +53,7 @@ config KVM_ARM_PMU bool "Virtual Performance Monitoring Unit (PMU) support" depends on HW_PERF_EVENTS default y - ---help--- + help Adds support for a virtual Performance Monitoring Unit (PMU) in virtual machines. |