diff options
| author | Tejun Heo <tj@kernel.org> | 2011-11-21 21:32:23 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-11-21 21:32:23 +0100 |
| commit | a5be2d0d1a8746e7be5210e3d6b904455000443c (patch) | |
| tree | 1dcfa2725057a73059a3f768f5f5f7825b5d56ef /mm | |
| parent | freezer: implement and use kthread_freezable_should_stop() (diff) | |
| download | linux-a5be2d0d1a8746e7be5210e3d6b904455000443c.tar.xz linux-a5be2d0d1a8746e7be5210e3d6b904455000443c.zip | |
freezer: rename thaw_process() to __thaw_task() and simplify the implementation
thaw_process() now has only internal users - system and cgroup
freezers. Remove the unnecessary return value, rename, unexport and
collapse __thaw_process() into it. This will help further updates to
the freezer code.
-v3: oom_kill grew a use of thaw_process() while this patch was
pending. Convert it to use __thaw_task() for now. In the longer
term, this should be handled by allowing tasks to die if killed
even if it's frozen.
-v2: minor style update as suggested by Matt.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Paul Menage <menage@google.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Diffstat (limited to 'mm')
| -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 76f2c5ae908e..3134ee2fb2e8 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -328,7 +328,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints, */ if (test_tsk_thread_flag(p, TIF_MEMDIE)) { if (unlikely(frozen(p))) - thaw_process(p); + __thaw_task(p); return ERR_PTR(-1UL); } if (!p->mm) |