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

Commit fbe84a09 authored Jul 26, 2016 by Tetsuo Handa Committed by Linus Torvalds Jul 26, 2016

mm,oom: remove unused argument from oom_scan_process_thread().

oom_scan_process_thread() does not use totalpages argument.
oom_badness() uses it.

Link: http://lkml.kernel.org/r/1463796041-7889-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp


Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3aa9799e

include/linux/oom.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ extern void check_panic_on_oom(struct oom_control *oc,
		enum oom_constraint constraint);

		extern enum oom_scan_t oom_scan_process_thread(struct oom_control *oc,
		struct task_struct *task, unsigned long totalpages);
		struct task_struct *task);

		extern bool out_of_memory(struct oom_control *oc);

mm/memcontrol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1290,7 +1290,7 @@ static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,

		css_task_iter_start(&iter->css, &it);
		while ((task = css_task_iter_next(&it))) {
		switch (oom_scan_process_thread(&oc, task, totalpages)) {
		switch (oom_scan_process_thread(&oc, task)) {
		case OOM_SCAN_SELECT:
		if (chosen)
		put_task_struct(chosen);

mm/oom_kill.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ static enum oom_constraint constrained_alloc(struct oom_control *oc,
		#endif

		enum oom_scan_t oom_scan_process_thread(struct oom_control *oc,
		struct task_struct *task, unsigned long totalpages)
		struct task_struct *task)
		{
		if (oom_unkillable_task(task, NULL, oc->nodemask))
		return OOM_SCAN_CONTINUE;
		@@ -311,7 +311,7 @@ static struct task_struct select_bad_process(struct oom_control oc,
		for_each_process(p) {
		unsigned int points;

		switch (oom_scan_process_thread(oc, p, totalpages)) {
		switch (oom_scan_process_thread(oc, p)) {
		case OOM_SCAN_SELECT:
		chosen = p;
		chosen_points = ULONG_MAX;