Merge tag 'perf-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 93e1faf..1c12059 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -6,8 +6,7 @@ config DEFCONFIG_LIST
        default "/lib/modules/$(shell,uname -r)/.config"
        default "/etc/kernel-config"
        default "/boot/config-$(shell,uname -r)"
-       default ARCH_DEFCONFIG
-       default "arch/$(ARCH)/defconfig"
+       default "arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)"
 
 config CC_IS_GCC
        def_bool $(success,$(CC) --version | head -n 1 | grep -q gcc)
@@ -1620,6 +1619,19 @@ config KALLSYMS_BASE_RELATIVE
 # end of the "standard kernel features (expert users)" menu
 
 # syscall, maps, verifier
+
+config BPF_LSM
+       bool "LSM Instrumentation with BPF"
+       depends on BPF_EVENTS
+       depends on BPF_SYSCALL
+       depends on SECURITY
+       depends on BPF_JIT
+       help
+         Enables instrumentation of the security hooks with eBPF programs for
+         implementing dynamic MAC and Audit Policies.
+
+         If you are unsure how to answer this question, answer N.
+
 config BPF_SYSCALL
        bool "Enable bpf() system call"
        select BPF
@@ -2212,6 +2224,19 @@ config TRIM_UNUSED_KSYMS
 
          If unsure, or if you need to build out-of-tree modules, say N.
 
+config UNUSED_KSYMS_WHITELIST
+       string "Whitelist of symbols to keep in ksymtab"
+       depends on TRIM_UNUSED_KSYMS
+       help
+         By default, all unused exported symbols will be un-exported from the
+         build when TRIM_UNUSED_KSYMS is selected.
+
+         UNUSED_KSYMS_WHITELIST allows to whitelist symbols that must be kept
+         exported at all times, even in absence of in-tree users. The value to
+         set here is the path to a text file containing the list of symbols,
+         one per line. The path can be absolute, or relative to the kernel
+         source tree.
+
 endif # MODULES
 
 config MODULES_TREE_LOOKUP