diff options
author | Paul E. McKenney <paulmck@kernel.org> | 2022-07-21 17:46:18 -0700 |
---|---|---|
committer | Paul E. McKenney <paulmck@kernel.org> | 2022-07-21 17:46:18 -0700 |
commit | 34bc7b454dc31f75a0be7ee8ab378135523d7c51 (patch) | |
tree | a1891ee085290746b6835e5e33e3c31cec2489fa /init | |
parent | d38c8fe48354af9c7120291938574e1ebb221d52 (diff) | |
parent | 1dcaa3b462265f688613163a1562a65ee53a3311 (diff) | |
download | linux-stable-34bc7b454dc31f75a0be7ee8ab378135523d7c51.tar.gz linux-stable-34bc7b454dc31f75a0be7ee8ab378135523d7c51.tar.bz2 linux-stable-34bc7b454dc31f75a0be7ee8ab378135523d7c51.zip |
Merge branch 'ctxt.2022.07.05a' into HEAD
ctxt.2022.07.05a: Linux-kernel memory model development branch.
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index c7900e8975f1..06454d19e2f0 100644 --- 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" - 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 - 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 |