Merge branch 'pm-domains' into pm-for-linus

[linux-2.6-microblaze.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 069b64e..eeb27e2 100644 (file)
--- 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)