From d43b285b602b587ed4736004e1b79a030b0f3f12 Mon Sep 17 00:00:00 2001
From: UtsavBalar1231 <utsavbalar1231@gmail.com>
Date: Tue, 26 Apr 2022 21:13:45 +0530
Subject: [PATCH] Revert "kernel: trigger lmkd specific triggers during
 emergency"

This reverts commit a632490cf26f56d79ace3795e876c0d8db29812c.

Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
Change-Id: Iec397cf9b23dfcf48b6ed648518a6f4d3a125f92
---
 include/linux/oom.h       | 1 -
 include/linux/psi_types.h | 2 --
 kernel/sched/psi.c        | 4 ----
 mm/oom_kill.c             | 2 ++
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/linux/oom.h b/include/linux/oom.h
index 9cad684843f1..679abc3f8460 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -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 */
diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h
index 3d9f4a501770..c617a9bbc4aa 100644
--- a/include/linux/psi_types.h
+++ b/include/linux/psi_types.h
@@ -121,8 +121,6 @@ struct psi_trigger {
 	 */
 	u64 last_event_time;
 
-	/* Task that created the trigger */
-	char comm[TASK_COMM_LEN];
 };
 
 struct psi_group {
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 77436fb287f8..062ffc9fb748 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -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);
 
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index c19bb7e6a109..29f2d3d6ac49 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -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;