Merge tag 'nolibc.2022.07.27a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulm...

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index c7900e8..7f75a61 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -494,11 +494,11 @@ config VIRT_CPU_ACCOUNTING_NATIVE
 
 config VIRT_CPU_ACCOUNTING_GEN
        bool "Full dynticks CPU time accounting"
 
 config VIRT_CPU_ACCOUNTING_GEN
        bool "Full dynticks CPU time accounting"

-       depends on HAVE_CONTEXT_TRACKING
+       depends on HAVE_CONTEXT_TRACKING_USER

        depends on HAVE_VIRT_CPU_ACCOUNTING_GEN
        depends on GENERIC_CLOCKEVENTS
        select VIRT_CPU_ACCOUNTING
        depends on HAVE_VIRT_CPU_ACCOUNTING_GEN
        depends on GENERIC_CLOCKEVENTS
        select VIRT_CPU_ACCOUNTING

-       select CONTEXT_TRACKING
+       select CONTEXT_TRACKING_USER

        help
          Select this option to enable task and CPU time accounting on full
          dynticks systems. This accounting is implemented by watching every
        help
          Select this option to enable task and CPU time accounting on full
          dynticks systems. This accounting is implemented by watching every


@@ -1481,6 +1481,7 @@ config HAVE_PCSPKR_PLATFORM
 # interpreter that classic socket filters depend on
 config BPF
        bool
 # interpreter that classic socket filters depend on
 config BPF
        bool

+       select CRYPTO_LIB_SHA1

 
 menuconfig EXPERT
        bool "Configure standard kernel features (expert users)"
 
 menuconfig EXPERT
        bool "Configure standard kernel features (expert users)"