Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

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

diff --git a/init/Kconfig b/init/Kconfig
index 68ddbcd..9e22ee8 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)
@@ -455,6 +454,10 @@ config HAVE_SCHED_AVG_IRQ
        depends on IRQ_TIME_ACCOUNTING || PARAVIRT_TIME_ACCOUNTING
        depends on SMP
 
+config SCHED_THERMAL_PRESSURE
+       bool "Enable periodic averaging of thermal pressure"
+       depends on SMP
+
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
        depends on MULTIUSER
@@ -771,8 +774,7 @@ config ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH
        bool
 
 config CC_HAS_INT128
-       def_bool y
-       depends on !$(cc-option,-D__SIZEOF_INT128__=0)
+       def_bool !$(cc-option,$(m64-flag) -D__SIZEOF_INT128__=0) && 64BIT
 
 #
 # For architectures that know their GCC __int128 support is sound
@@ -874,7 +876,7 @@ config BLK_CGROUP
        This option only enables generic Block IO controller infrastructure.
        One needs to also enable actual IO controlling logic/policy. For
        enabling proportional weight division of disk bandwidth in CFQ, set
-       CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
+       CONFIG_BFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
        CONFIG_BLK_DEV_THROTTLING=y.
 
        See Documentation/admin-guide/cgroup-v1/blkio-controller.rst for more information.
@@ -1031,7 +1033,8 @@ config CGROUP_PERF
        help
          This option extends the perf per-cpu mode to restrict monitoring
          to threads which belong to the cgroup specified and run on the
-         designated cpu.
+         designated cpu.  Or this can be used to have cgroup ID in samples
+         so that it can monitor performance events among cgroups.
 
          Say N if unsure.
 
@@ -1230,13 +1233,12 @@ endif
 
 config BOOT_CONFIG
        bool "Boot config support"
-       depends on BLK_DEV_INITRD
-       default y
+       select BLK_DEV_INITRD
        help
          Extra boot config allows system admin to pass a config file as
          complemental extension of kernel cmdline when booting.
          The boot config file must be attached at the end of initramfs
-         with checksum and size.
+         with checksum, size and magic word.
          See <file:Documentation/admin-guide/bootconfig.rst> for details.
 
          If unsure, say Y.
@@ -1540,7 +1542,6 @@ config AIO
 
 config IO_URING
        bool "Enable IO uring support" if EXPERT
-       select ANON_INODES
        select IO_WQ
        default y
        help
@@ -1558,6 +1559,11 @@ config ADVISE_SYSCALLS
          applications use these syscalls, you can disable this option to save
          space.
 
+config HAVE_ARCH_USERFAULTFD_WP
+       bool
+       help
+         Arch has userfaultfd write protection support
+
 config MEMBARRIER
        bool "Enable membarrier() system call" if EXPERT
        default y
@@ -1621,6 +1627,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
@@ -2213,6 +2232,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