drivers/scsi: Remove unnecessary casts of private_data

[net-next-2.6.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index b6cce14ba0470e641bd45c68ca2067c4ee70d38c..98b450876f93878b437bbbc6efe6abd1c4028b29 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -899,6 +899,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
        tty_audit_fork(sig);
 
        sig->oom_adj = current->signal->oom_adj;
+       sig->oom_score_adj = current->signal->oom_score_adj;
 
        return 0;
 }
@@ -907,7 +908,7 @@ static 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_WQ_WORKER);
        new_flags |= PF_FORKNOEXEC;
        new_flags |= PF_STARTING;
        p->flags = new_flags;