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

Commit 8e4228e1 authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

oom: move sysctl declarations to oom.h 



The three oom killer sysctl variables (sysctl_oom_dump_tasks,
sysctl_oom_kill_allocating_task, and sysctl_panic_on_oom) are better
declared in include/linux/oom.h rather than kernel/sysctl.c.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e3658932

include/linux/oom.h

+5 −0
Original line number Diff line number Diff line
@@ -44,5 +44,10 @@ static inline void oom_killer_enable(void) 
{

	oom_killer_disabled = false;

}



/* sysctls */

extern int sysctl_oom_dump_tasks;

extern int sysctl_oom_kill_allocating_task;

extern int sysctl_panic_on_oom;

#endif /* __KERNEL__*/

#endif /* _INCLUDE_LINUX_OOM_H */

kernel/sysctl.c

+1 −3
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/perf_event.h>

#include <linux/kprobes.h>

#include <linux/pipe_fs_i.h>

#include <linux/oom.h>



#include <asm/uaccess.h>

#include <asm/processor.h>
@@ -85,9 +86,6 @@ 
/* External variables not in a header file. */

extern int sysctl_overcommit_memory;

extern int sysctl_overcommit_ratio;

extern int sysctl_panic_on_oom;

extern int sysctl_oom_kill_allocating_task;

extern int sysctl_oom_dump_tasks;

extern int max_threads;

extern int core_uses_pid;

extern int suid_dumpable;