summaryrefslogtreecommitdiffstats
path: root/samples/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-08 15:25:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-08 15:25:12 -0400
commit2646719a48c21ba0cae82a3f57382a9573fd8400 (patch)
treeb37f3832be601bc62d04c4c37cc97b80feaf8d9a /samples/Kconfig
parent019d7316ea84b7d8a8bcb9f2036aa4917a32986a (diff)
parent7fb1fc420f3b1cb27cce5aa1050eb5d9161d0944 (diff)
Merge tag 'kbuild-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada: - allow users to invoke 'make' out of the source tree - refactor scripts/mkmakefile - deprecate KBUILD_SRC, which was used to track the source tree location for O= build. - fix recordmcount.pl in case objdump output is localized - turn unresolved symbols in external modules to errors from warnings by default; pass KBUILD_MODPOST_WARN=1 to get them back to warnings - generate modules.builtin.modinfo to collect .modinfo data from built-in modules - misc Makefile cleanups * tag 'kbuild-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (21 commits) .gitignore: add more all*.config patterns moduleparam: Save information about built-in modules in separate file Remove MODULE_ALIAS() calls that take undefined macro .gitignore: add leading and trailing slashes to generated directories scripts/tags.sh: fix direct execution of scripts/tags.sh scripts: override locale from environment when running recordmcount.pl samples: kobject: allow CONFIG_SAMPLE_KOBJECT to become y samples: seccomp: turn CONFIG_SAMPLE_SECCOMP into a bool option kbuild: move Documentation to vmlinux-alldirs kbuild: move samples/ to KBUILD_VMLINUX_OBJS modpost: make KBUILD_MODPOST_WARN also configurable for external modules kbuild: check arch/$(SRCARCH)/include/generated before out-of-tree build kbuild: remove unneeded dependency for include/config/kernel.release memory: squash drivers/memory/Makefile.asm-offsets kbuild: use $(srctree) instead of KBUILD_SRC to check out-of-tree build kbuild: mkmakefile: generate a simple wrapper of top Makefile kbuild: mkmakefile: do not check the generated Makefile marker kbuild: allow Kbuild to start from any directory kbuild: pass $(MAKECMDGOALS) to sub-make as is kbuild: fix warning "overriding recipe for target 'Makefile'" ...
Diffstat (limited to 'samples/Kconfig')
-rw-r--r--samples/Kconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/samples/Kconfig b/samples/Kconfig
index 30a89425009c..0561a94f6fdb 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -20,8 +20,7 @@ config SAMPLE_TRACE_PRINTK
20 test various trace_printk() calls from a module. 20 test various trace_printk() calls from a module.
21 21
22config SAMPLE_KOBJECT 22config SAMPLE_KOBJECT
23 tristate "Build kobject examples -- loadable modules only" 23 tristate "Build kobject examples"
24 depends on m
25 help 24 help
26 This config option will allow you to build a number of 25 This config option will allow you to build a number of
27 different kobject sample modules showing how to use kobjects, 26 different kobject sample modules showing how to use kobjects,
@@ -103,8 +102,8 @@ config SAMPLE_CONNECTOR
103 See also Documentation/connector/connector.txt 102 See also Documentation/connector/connector.txt
104 103
105config SAMPLE_SECCOMP 104config SAMPLE_SECCOMP
106 tristate "Build seccomp sample code -- loadable modules only" 105 bool "Build seccomp sample code"
107 depends on SECCOMP_FILTER && m 106 depends on SECCOMP_FILTER
108 help 107 help
109 Build samples of seccomp filters using various methods of 108 Build samples of seccomp filters using various methods of
110 BPF filter construction. 109 BPF filter construction.