diff --git a/[refs] b/[refs] index 1e89c8978e6b..baa2cbf6d0cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9b25fabfddf142b5af8268692701d386cf37e4f +refs/heads/master: d1209d049bbc3df66650f8417637be4f7b57b604 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 533ce27f4b2c..280bd44ac441 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -848,7 +848,7 @@ static inline void copy_flags(unsigned long clone_flags, struct task_struct *p) { unsigned long new_flags = p->flags; - new_flags &= ~PF_SUPERPRIV; + new_flags &= ~(PF_SUPERPRIV | PF_NOFREEZE); new_flags |= PF_FORKNOEXEC; if (!(clone_flags & CLONE_PTRACE)) p->ptrace = 0;