aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2020-05-20 15:18:00 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2020-05-21 22:58:23 +1000
commit1c4a4ab9f3451f7cfb4f58a867ba24a6e4f65a4b (patch)
treeb23358955955582358a71fbc473033c7f75b5e51
parentec888f5405549fe9a7650a80b338e20a08425e13 (diff)
doc-cgroup-update-note-about-conditions-when-oom-killer-is-invoked-fix
fixes per Randy Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Cc: Michal Hocko <mhocko@suse.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Roman Gushchin <guro@fb.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Documentation/admin-guide/cgroup-v2.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index b7bb6386b862..fed4e1d2a343 100644
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -1172,8 +1172,8 @@ PAGE_SIZE multiple when read back.
Under certain circumstances, the usage may go over the limit
temporarily.
- In default configuration regular 0-order allocation always
- succeed unless OOM killer choose current task as a victim.
+ In default configuration regular 0-order allocations always
+ succeed unless OOM killer chooses current task as a victim.
Some kinds of allocations don't invoke the OOM killer.
Caller could retry them differently, return into userspace