Add the option to kconfig and set the default panic_on_value. Signed-off-by: Eddie James <eajames@xxxxxxxxxxxxx> --- mm/Kconfig | 7 +++++++ mm/oom_kill.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mm/Kconfig b/mm/Kconfig index 675a6be43739..1fde865b0a63 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -825,6 +825,13 @@ config ZSMALLOC_STAT config GENERIC_EARLY_IOREMAP bool +config PANIC_ON_OOM_DEFAULT + int "Startup setting for panic_on_oom" + default 0 + range 0 2 + help + This is the default startup value for /proc/sys/vm/panic_on_oom + config STACK_MAX_DEFAULT_SIZE_MB int "Default maximum user stack size for 32-bit processes (MB)" default 100 diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 3996301450e8..a6a9cc5635f8 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -52,7 +52,7 @@ #define CREATE_TRACE_POINTS #include <trace/events/oom.h> -static int sysctl_panic_on_oom; +static int sysctl_panic_on_oom = CONFIG_PANIC_ON_OOM_DEFAULT; static int sysctl_oom_kill_allocating_task; static int sysctl_oom_dump_tasks = 1; -- 2.27.0
