summaryrefslogtreecommitdiff
path: root/arch/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 13:29:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 13:29:16 -0700
commit6adc19fd13f11883c44df67b551cf8201e6bba1d (patch)
tree455e80aca7b57b17069fab252261c4dcae44374d /arch/Kconfig
parent3df83e164f1f39c614a3f31e39164756945ae2ea (diff)
parenta7f7f6248d9740d710fd6bd190293fe5e16410ac (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/Kconfig')
-rw-r--r--arch/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 6d2ba653fe49..8cc35dc556c7 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -876,7 +876,7 @@ config VMAP_STACK
bool "Use a virtually-mapped stack"
depends on HAVE_ARCH_VMAP_STACK
depends on !KASAN || KASAN_VMALLOC
- ---help---
+ help
Enable this if you want the use virtually-mapped kernel stacks
with guard pages. This causes kernel stack overflows to be
caught immediately rather than causing difficult-to-diagnose
@@ -948,7 +948,7 @@ config ARCH_USE_MEMREMAP_PROT
config LOCK_EVENT_COUNTS
bool "Locking event counts collection"
depends on DEBUG_FS
- ---help---
+ help
Enable light-weight counting of various locking related events
in the system with minimal performance impact. This reduces
the chance of application behavior change because of timing