projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0527b69
)
mm: oom_kill: remove memcg argument from oom_kill_task()
author
Johannes Weiner
<
[email protected]
>
Fri, 13 Jan 2012 01:18:29 +0000
(17:18 -0800)
committer
Linus Torvalds
<
[email protected]
>
Fri, 13 Jan 2012 04:13:06 +0000
(20:13 -0800)
The memcg argument of oom_kill_task() hasn't been used since
341aea2
'oom-kill: remove boost_dying_task_prio()'. Kill it.
Signed-off-by: Johannes Weiner <
[email protected]
>
Acked-by: David Rientjes <
[email protected]
>
Acked-by: KAMEZAWA Hiroyuki <
[email protected]
>
Acked-by: Michal Hocko <
[email protected]
>
Cc: Balbir Singh <
[email protected]
>
Cc: Hugh Dickins <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
mm/oom_kill.c
patch
|
blob
|
history
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index 7c122faa05c5ba07fc11df6f5149909680c14f3c..05c0f27d4ed149744c15bf5edac497ef313d8a76 100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-434,7
+434,7
@@
static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
}
#define K(x) ((x) << (PAGE_SHIFT-10))
-static int oom_kill_task(struct task_struct *p
, struct mem_cgroup *mem
)
+static int oom_kill_task(struct task_struct *p)
{
struct task_struct *q;
struct mm_struct *mm;
@@
-533,7
+533,7
@@
static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
}
} while_each_thread(p, t);
- return oom_kill_task(victim
, mem
);
+ return oom_kill_task(victim);
}
/*