diff --git a/[refs] b/[refs] index c9c318bc8673..6583624ad693 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f51201662b28dbf8c15fb7eb972bc51c6cc3fa5 +refs/heads/master: 932aeafbe8521a9a9d790152d66020e0fef2029b diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 1de69cdc0e6c..fc02dadc604a 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -641,8 +641,10 @@ static inline int de_thread(struct task_struct *tsk) * before we can safely let the old group leader die. */ sig->real_timer.data = (unsigned long)current; + spin_unlock_irq(lock); if (del_timer_sync(&sig->real_timer)) add_timer(&sig->real_timer); + spin_lock_irq(lock); } while (atomic_read(&sig->count) > count) { sig->group_exit_task = current; @@ -654,7 +656,6 @@ static inline int de_thread(struct task_struct *tsk) } sig->group_exit_task = NULL; sig->notify_count = 0; - sig->real_timer.data = (unsigned long)current; spin_unlock_irq(lock); /*