Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5852b0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: reap tasks that are killed by prekill"

parents d54b4c37 fc6b78b3

include/linux/oom.h

+1 −0
Original line number Diff line number Diff line
@@ -136,4 +136,5 @@ extern int sysctl_reap_mem_on_sigkill; 
extern void add_to_oom_reaper(struct task_struct *p);

extern void check_panic_on_foreground_kill(struct task_struct *p);

#define ULMK_MAGIC "lmkd"

#define PRE_KILL "PreKillActionT"

#endif /* _INCLUDE_LINUX_OOM_H */

kernel/signal.c

+2 −1
Original line number Diff line number Diff line
@@ -1416,7 +1416,8 @@ int group_send_sig_info(int sig, struct kernel_siginfo *info, 
		check_panic_on_foreground_kill(p);

		ret = do_send_sig_info(sig, info, p, type);

		if (capable(CAP_KILL) && sig == SIGKILL)

			if (!strcmp(current->comm, ULMK_MAGIC))

			if (!strcmp(current->comm, ULMK_MAGIC) ||

				!strcmp(current->comm, PRE_KILL))

				add_to_oom_reaper(p);

	}