diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:06:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:06:09 -0400 |
| commit | 902f90735b693550eb51a3989895f3148b8229d8 (patch) | |
| tree | faddc60f0b27ed6d2a26f20c2c09f365dc4a2d7d /kernel/fork.c | |
| parent | 07b8fede6da76ae6a0f547716c44b801a116bb4a (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
Merge branch 'master'
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; |