diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-23 20:56:59 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-23 20:56:59 -0400 |
| commit | e7d311da9cba1e113f82176130d3af1be77dc3ee (patch) | |
| tree | 05b4baf382124a9a0342777127c09832dcbd88c0 /kernel/fork.c | |
| parent | c8e0ca683dfea7242ff29814561dfe761945e5b3 (diff) | |
| parent | ba9e358fd04190a59e605c2963a15e014139a707 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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; |