summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2020-05-14 13:41:14 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2020-05-14 20:12:36 +1000
commitde7d3b4d5ab3c9ae107a6af0c8992210f478c9a6 (patch)
tree6bb24f1a0ae8e8d729b0474caa8a5d4498819b70
parentc39d4f114f8659a39ac98e558cd841d882bfd9e3 (diff)
downloadlinux-de7d3b4d5ab3c9ae107a6af0c8992210f478c9a6.tar.gz
linux-de7d3b4d5ab3c9ae107a6af0c8992210f478c9a6.tar.xz
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