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:
f522886
)
oom: fix NULL pointer dereference
author
KOSAKI Motohiro
<
[email protected]
>
Thu, 19 Aug 2010 21:13:38 +0000
(14:13 -0700)
committer
Linus Torvalds
<
[email protected]
>
Fri, 20 Aug 2010 16:34:55 +0000
(09:34 -0700)
Commit
b940fd7035
("oom: remove unnecessary code and cleanup") added an
unnecessary NULL pointer dereference. remove it.
Signed-off-by: KOSAKI Motohiro <
[email protected]
>
Reviewed-by: Minchan Kim <
[email protected]
>
Acked-by: David Rientjes <
[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 5014e50644d1b7528a06fca742677cf1a77cc04f..17d48a67e7b7a448c1866c011a3194f60852da8f 100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-401,10
+401,9
@@
static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)
{
p = find_lock_task_mm(p);
- if (!p) {
- task_unlock(p);
+ if (!p)
return 1;
- }
+
pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
task_pid_nr(p), p->comm, K(p->mm->total_vm),
K(get_mm_counter(p->mm, MM_ANONPAGES)),