diff --git a/[refs] b/[refs] index 12f24e3bb767..5f6db82a7f21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6aa9707099c4b25700940eb3d016f16c4434360d +refs/heads/master: 80d26af89a7249aa5475467000322163c60cdd72 diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index aaf97c122e8a..51e485ca9935 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -485,7 +485,7 @@ static void exit_mm(struct task_struct * tsk) set_task_state(tsk, TASK_UNINTERRUPTIBLE); if (!self.task) /* see coredump_finish() */ break; - schedule(); + freezable_schedule(); } __set_task_state(tsk, TASK_RUNNING); down_read(&mm->mmap_sem);