diff options
Diffstat (limited to 'Documentation/cgroups/memory.txt')
| -rw-r--r-- | Documentation/cgroups/memory.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 268ab08222dd..f8bc802d70b9 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt | |||
| @@ -182,6 +182,8 @@ list. | |||
| 182 | NOTE: Reclaim does not work for the root cgroup, since we cannot set any | 182 | NOTE: Reclaim does not work for the root cgroup, since we cannot set any |
| 183 | limits on the root cgroup. | 183 | limits on the root cgroup. |
| 184 | 184 | ||
| 185 | Note2: When panic_on_oom is set to "2", the whole system will panic. | ||
| 186 | |||
| 185 | 2. Locking | 187 | 2. Locking |
| 186 | 188 | ||
| 187 | The memory controller uses the following hierarchy | 189 | The memory controller uses the following hierarchy |
| @@ -379,7 +381,8 @@ The feature can be disabled by | |||
| 379 | NOTE1: Enabling/disabling will fail if the cgroup already has other | 381 | NOTE1: Enabling/disabling will fail if the cgroup already has other |
| 380 | cgroups created below it. | 382 | cgroups created below it. |
| 381 | 383 | ||
| 382 | NOTE2: This feature can be enabled/disabled per subtree. | 384 | NOTE2: When panic_on_oom is set to "2", the whole system will panic in |
| 385 | case of an oom event in any cgroup. | ||
| 383 | 386 | ||
| 384 | 7. Soft limits | 387 | 7. Soft limits |
| 385 | 388 | ||