libceph: be less chatty about stray replies

[firefly-linux-kernel-4.4.55.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 6d85655353e919fd56e0d2cc65cb36862e328a8c..34867cc5b42a77f325c204bb2fd09e1fabe38955 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -946,12 +946,13 @@ void do_exit(long code)
        exit_signals(tsk);  /* sets PF_EXITING */
        /*
         * tsk->flags are checked in the futex code to protect against
-        * an exiting task cleaning up the robust pi futexes.
+        * an exiting task cleaning up the robust pi futexes, and in
+        * task_work_add() to avoid the race with exit_task_work().
         */
        smp_mb();
        raw_spin_unlock_wait(&tsk->pi_lock);
 
-       exit_irq_thread();
+       exit_task_work(tsk);
 
        if (unlikely(in_atomic()))
                printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",