diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-21 21:33:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-21 21:33:27 -0400 |
| commit | e78a57de94480226f7fc90d0b4837bfc6c99a9e0 (patch) | |
| tree | bfe0a664f88b6cb9d284869d615ae2d7fdb7cf63 /kernel/fork.c | |
| parent | 77501f3cb648e18733509a951ed31eddd7ef2c0b (diff) | |
| parent | 452503f993feffe96e8cc9fbff4888b96e2c5e40 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 533ce27f4b2c..280bd44ac441 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -848,7 +848,7 @@ static inline void copy_flags(unsigned long clone_flags, struct task_struct *p) | |||
| 848 | { | 848 | { |
| 849 | unsigned long new_flags = p->flags; | 849 | unsigned long new_flags = p->flags; |
| 850 | 850 | ||
| 851 | new_flags &= ~PF_SUPERPRIV; | 851 | new_flags &= ~(PF_SUPERPRIV | PF_NOFREEZE); |
| 852 | new_flags |= PF_FORKNOEXEC; | 852 | new_flags |= PF_FORKNOEXEC; |
| 853 | if (!(clone_flags & CLONE_PTRACE)) | 853 | if (!(clone_flags & CLONE_PTRACE)) |
| 854 | p->ptrace = 0; | 854 | p->ptrace = 0; |