Merge remote-tracking branch 'tip/auto-latest'

[karo-tx-linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 826aacc7399be01af126f688334f73e4fd64aa88..e41a5d652533f87710063fc7d0ab0a1afac0142e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -791,6 +791,19 @@ config RCU_NOCB_CPU_ALL
 
 endchoice
 
+config RCU_EXPEDITE_BOOT
+       bool
+       default n
+       help
+         This option enables expedited grace periods at boot time,
+         as if rcu_expedite_gp() had been invoked early in boot.
+         The corresponding rcu_unexpedite_gp() is invoked from
+         rcu_end_inkernel_boot(), which is intended to be invoked
+         at the end of the kernel-only boot sequence, just before
+         init is exec'ed.
+
+         Accept the default if unsure.
+
 endmenu # "RCU Subsystem"
 
 config BUILD_BIN2C
@@ -1584,7 +1597,7 @@ config EVENTFD
 
 # syscall, maps, verifier
 config BPF_SYSCALL
-       bool "Enable bpf() system call" if EXPERT
+       bool "Enable bpf() system call"
        select ANON_INODES
        select BPF
        default n