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>

diff --git a/include/linux/oom.h b/include/linux/oom.h
index cbc24a5fe28da19fc53fc7c3be6a8c0717dc1206..606137b3b778e224291ba89e2df3d87277134aa8 100644 (file)
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -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);
 

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index ff53e348c4bbf7d0b55f9cd8b42c18375688275f..1a1a3093a5c9e8c6cb454b5234f36dd3e5c62c8f 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -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);

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index a376f1ebdad5a120a6daca0cb6a56ce85ca21c16..c11f8bdd0c12cea00cf13d57fc53c323439e010c 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -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;