diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /mm/oom_kill.c | |
parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) |
Merge branch 'master' into for-linus
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index d3def05a33d9..5014e50644d1 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -106,7 +106,7 @@ static void boost_dying_task_prio(struct task_struct *p, | |||
106 | * pointer. Return p, or any of its subthreads with a valid ->mm, with | 106 | * pointer. Return p, or any of its subthreads with a valid ->mm, with |
107 | * task_lock() held. | 107 | * task_lock() held. |
108 | */ | 108 | */ |
109 | static struct task_struct *find_lock_task_mm(struct task_struct *p) | 109 | struct task_struct *find_lock_task_mm(struct task_struct *p) |
110 | { | 110 | { |
111 | struct task_struct *t = p; | 111 | struct task_struct *t = p; |
112 | 112 | ||