Revert "kernel: trigger lmkd specific triggers during emergency"

This reverts commit a632490cf2.

Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
Change-Id: Iec397cf9b23dfcf48b6ed648518a6f4d3a125f92
This commit is contained in:
UtsavBalar1231 2022-04-26 21:13:45 +05:30 committed by spakkkk
parent d58a680e28
commit d43b285b60
4 changed files with 2 additions and 7 deletions

View File

@ -136,5 +136,4 @@ extern int sysctl_reap_mem_on_sigkill;
/* calls for LMK reaper */
extern void add_to_oom_reaper(struct task_struct *p);
#define ULMK_MAGIC "lmkd"
#endif /* _INCLUDE_LINUX_OOM_H */

View File

@ -121,8 +121,6 @@ struct psi_trigger {
*/
u64 last_event_time;
/* Task that created the trigger */
char comm[TASK_COMM_LEN];
};
struct psi_group {

View File

@ -140,7 +140,6 @@
#include <linux/file.h>
#include <linux/poll.h>
#include <linux/psi.h>
#include <linux/oom.h>
#include "sched.h"
#define CREATE_TRACE_POINTS
@ -608,8 +607,6 @@ void psi_emergency_trigger(void)
return;
list_for_each_entry(t, &group->triggers, node) {
if (strcmp(t->comm, ULMK_MAGIC))
continue;
trace_psi_event(t->state, t->threshold);
/* Generate an event */
@ -1118,7 +1115,6 @@ struct psi_trigger *psi_trigger_create(struct psi_group *group,
t->event = 0;
t->last_event_time = 0;
init_waitqueue_head(&t->event_wait);
get_task_comm(t->comm, current);
mutex_lock(&group->trigger_lock);

View File

@ -52,6 +52,8 @@
#define CREATE_TRACE_POINTS
#include <trace/events/oom.h>
#define ULMK_MAGIC "lmkd"
int sysctl_panic_on_oom =
IS_ENABLED(CONFIG_DEBUG_PANIC_ON_OOM) ? 2 : 0;
int sysctl_oom_kill_allocating_task;