|author||Ingo Molnar <firstname.lastname@example.org>||2019-02-11 08:01:50 +0100|
|committer||Ingo Molnar <email@example.com>||2019-02-11 08:01:50 +0100|
Merge tag 'v5.0-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <firstname.lastname@example.org>
Diffstat (limited to 'init')
1 files changed, 12 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 513fa544a134..c9386a365eea 100644
@@ -512,6 +512,17 @@ config PSI_DEFAULT_DISABLED
per default but can be enabled through passing psi=1 on the
kernel commandline during boot.
+ This feature adds some code to the task wakeup and sleep
+ paths of the scheduler. The overhead is too low to affect
+ common scheduling-intense workloads in practice (such as
+ webservers, memcache), but it does show up in artificial
+ scheduler stress tests, such as hackbench.
+ If you are paranoid and not sure what the kernel will be
+ used for, say Y.
+ Say N if unsure.
endmenu # "CPU/Task time and stats accounting"
@@ -825,7 +836,7 @@ config CGROUP_PIDS
PIDs controller is designed to stop this from happening.
It should be noted that organisational operations (such as attaching
- to a cgroup hierarchy will *not* be blocked by the PIDs controller),
+ to a cgroup hierarchy) will *not* be blocked by the PIDs controller,
since the PIDs limit only affects a process's ability to fork, not to
attach to a cgroup.