diff options
author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2009-09-21 20:03:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:39 -0400 |
commit | 495789a51a91cb8c015d8d77fecbac1caf20b186 (patch) | |
tree | ac2a71ed40ed84f5673326aa6bf7f278b54d989a /Documentation | |
parent | 28b83c5193e7ab951e402252278f2cc79dc4d298 (diff) |
oom: make oom_score to per-process value
oom-killer kills a process, not task. Then oom_score should be calculated
as per-process too. it makes consistency more and makes speed up
select_bad_process().
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Paul Menage <menage@google.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/filesystems/proc.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index ae7f8bb1b7bc..75988ba26a51 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -1205,7 +1205,7 @@ The following heuristics are then applied: | |||
1205 | * if the task was reniced, its score doubles | 1205 | * if the task was reniced, its score doubles |
1206 | * superuser or direct hardware access tasks (CAP_SYS_ADMIN, CAP_SYS_RESOURCE | 1206 | * superuser or direct hardware access tasks (CAP_SYS_ADMIN, CAP_SYS_RESOURCE |
1207 | or CAP_SYS_RAWIO) have their score divided by 4 | 1207 | or CAP_SYS_RAWIO) have their score divided by 4 |
1208 | * if oom condition happened in one cpuset and checked task does not belong | 1208 | * if oom condition happened in one cpuset and checked process does not belong |
1209 | to it, its score is divided by 8 | 1209 | to it, its score is divided by 8 |
1210 | * the resulting score is multiplied by two to the power of oom_adj, i.e. | 1210 | * the resulting score is multiplied by two to the power of oom_adj, i.e. |
1211 | points <<= oom_adj when it is positive and | 1211 | points <<= oom_adj when it is positive and |