mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 12:25:00 -04:00
Merge "mm: oom_kill: Prevent debug messages from going to serial console"
This commit is contained in:
commit
bf91b15b89
1 changed files with 2 additions and 4 deletions
|
|
@ -1174,7 +1174,6 @@ void add_to_oom_reaper(struct task_struct *p)
|
|||
{
|
||||
static DEFINE_RATELIMIT_STATE(reaper_rs, DEFAULT_RATELIMIT_INTERVAL,
|
||||
DEFAULT_RATELIMIT_BURST);
|
||||
struct oom_control oc = {};
|
||||
|
||||
if (!sysctl_reap_mem_on_sigkill)
|
||||
return;
|
||||
|
|
@ -1190,11 +1189,10 @@ void add_to_oom_reaper(struct task_struct *p)
|
|||
}
|
||||
task_unlock(p);
|
||||
|
||||
if (__ratelimit(&reaper_rs) && p->signal->oom_score_adj == 0) {
|
||||
if (!strcmp(current->comm, ULMK_MAGIC) && __ratelimit(&reaper_rs)
|
||||
&& p->signal->oom_score_adj == 0) {
|
||||
show_mem(SHOW_MEM_FILTER_NODES, NULL);
|
||||
show_mem_call_notifiers();
|
||||
if (sysctl_oom_dump_tasks)
|
||||
dump_tasks(&oc);
|
||||
}
|
||||
|
||||
put_task_struct(p);
|
||||
|
|
|
|||
Loading…
Reference in a new issue