Fix test failure due to bad merge
Former-commit-id: f6fb0e462001c49af185682caed8881ccd6d36f3
This commit is contained in:
parent
79eaf32733
commit
c86f8030cd
@ -2757,7 +2757,7 @@ int setOOMScoreAdj(int process_class) {
|
|||||||
int val;
|
int val;
|
||||||
char buf[64];
|
char buf[64];
|
||||||
|
|
||||||
val = g_pserver->oom_score_adj_base + g_pserver->oom_score_adj_values[process_class];
|
val = g_pserver->oom_score_adj_values[process_class];
|
||||||
if (g_pserver->oom_score_adj == OOM_SCORE_RELATIVE)
|
if (g_pserver->oom_score_adj == OOM_SCORE_RELATIVE)
|
||||||
val += g_pserver->oom_score_adj_base;
|
val += g_pserver->oom_score_adj_base;
|
||||||
if (val > 1000) val = 1000;
|
if (val > 1000) val = 1000;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user