Skip to content

Commit a19cad0

Browse files
committed
mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery
arm allnoconfig: mm/oom_kill.c:60:25: warning: 'vm_oom_kill_table' defined but not used [-Wunused-variable] 60 | static struct ctl_table vm_oom_kill_table[] = { | ^~~~~~~~~~~~~~~~~ Cc: Luis Chamberlain <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent b3e34a4 commit a19cad0

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

mm/oom_kill.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -56,35 +56,6 @@ static int sysctl_panic_on_oom;
5656
static int sysctl_oom_kill_allocating_task;
5757
static int sysctl_oom_dump_tasks = 1;
5858

59-
#ifdef CONFIG_SYSCTL
60-
static struct ctl_table vm_oom_kill_table[] = {
61-
{
62-
.procname = "panic_on_oom",
63-
.data = &sysctl_panic_on_oom,
64-
.maxlen = sizeof(sysctl_panic_on_oom),
65-
.mode = 0644,
66-
.proc_handler = proc_dointvec_minmax,
67-
.extra1 = SYSCTL_ZERO,
68-
.extra2 = SYSCTL_TWO,
69-
},
70-
{
71-
.procname = "oom_kill_allocating_task",
72-
.data = &sysctl_oom_kill_allocating_task,
73-
.maxlen = sizeof(sysctl_oom_kill_allocating_task),
74-
.mode = 0644,
75-
.proc_handler = proc_dointvec,
76-
},
77-
{
78-
.procname = "oom_dump_tasks",
79-
.data = &sysctl_oom_dump_tasks,
80-
.maxlen = sizeof(sysctl_oom_dump_tasks),
81-
.mode = 0644,
82-
.proc_handler = proc_dointvec,
83-
},
84-
{}
85-
};
86-
#endif
87-
8859
/*
8960
* Serializes oom killer invocations (out_of_memory()) from all contexts to
9061
* prevent from over eager oom killing (e.g. when the oom killer is invoked
@@ -729,6 +700,35 @@ static void queue_oom_reaper(struct task_struct *tsk)
729700
add_timer(&tsk->oom_reaper_timer);
730701
}
731702

703+
#ifdef CONFIG_SYSCTL
704+
static struct ctl_table vm_oom_kill_table[] = {
705+
{
706+
.procname = "panic_on_oom",
707+
.data = &sysctl_panic_on_oom,
708+
.maxlen = sizeof(sysctl_panic_on_oom),
709+
.mode = 0644,
710+
.proc_handler = proc_dointvec_minmax,
711+
.extra1 = SYSCTL_ZERO,
712+
.extra2 = SYSCTL_TWO,
713+
},
714+
{
715+
.procname = "oom_kill_allocating_task",
716+
.data = &sysctl_oom_kill_allocating_task,
717+
.maxlen = sizeof(sysctl_oom_kill_allocating_task),
718+
.mode = 0644,
719+
.proc_handler = proc_dointvec,
720+
},
721+
{
722+
.procname = "oom_dump_tasks",
723+
.data = &sysctl_oom_dump_tasks,
724+
.maxlen = sizeof(sysctl_oom_dump_tasks),
725+
.mode = 0644,
726+
.proc_handler = proc_dointvec,
727+
},
728+
{}
729+
};
730+
#endif
731+
732732
static int __init oom_init(void)
733733
{
734734
oom_reaper_th = kthread_run(oom_reaper, NULL, "oom_reaper");

0 commit comments

Comments
 (0)