diff --git a/[refs] b/[refs] index dc2ccbf3ee25..28848dc29e50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 232b14328050a4639130b0dec185f43968e72035 +refs/heads/master: 2e1318956ce6bf149af5c5e98499b5cd99f99c89 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 490495a39c7e..7e455a93a75a 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -942,6 +942,7 @@ static inline void copy_flags(unsigned long clone_flags, struct task_struct *p) if (!(clone_flags & CLONE_PTRACE)) p->ptrace = 0; p->flags = new_flags; + clear_freeze_flag(p); } asmlinkage long sys_set_tid_address(int __user *tidptr)