From af038e35125d7e06b74ee84917ca62bb52c8c070 Mon Sep 17 00:00:00 2001 From: Oren Laadan Date: Sun, 8 Jan 2006 01:03:51 -0800 Subject: [PATCH] --- yaml --- r: 16993 b: refs/heads/master c: 9a5d3023e626a0baf86ac6b892c983b3db13f22b h: refs/heads/master i: 16991: 54619c1ff67cf96a958b2ed9f584215dfb9a7727 v: v3 --- [refs] | 2 +- trunk/kernel/fork.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9c640057dffa..cf1303fe07b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb86a35b9ded8a7e53a432cbf28df603cdd4849c +refs/heads/master: 9a5d3023e626a0baf86ac6b892c983b3db13f22b diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 7992ee759d89..4bc0bd8ef176 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -811,9 +811,6 @@ static inline int copy_signal(unsigned long clone_flags, struct task_struct * ts sig->it_prof_expires = cputime_zero; sig->it_prof_incr = cputime_zero; - sig->tty = current->signal->tty; - sig->pgrp = process_group(current); - sig->session = current->signal->session; sig->leader = 0; /* session leadership doesn't inherit */ sig->tty_old_pgrp = 0; @@ -1136,15 +1133,15 @@ static task_t *copy_process(unsigned long clone_flags, attach_pid(p, PIDTYPE_PID, p->pid); attach_pid(p, PIDTYPE_TGID, p->tgid); if (thread_group_leader(p)) { + p->signal->tty = current->signal->tty; + p->signal->pgrp = process_group(current); + p->signal->session = current->signal->session; attach_pid(p, PIDTYPE_PGID, process_group(p)); attach_pid(p, PIDTYPE_SID, p->signal->session); if (p->pid) __get_cpu_var(process_counts)++; } - if (!current->signal->tty && p->signal->tty) - p->signal->tty = NULL; - nr_threads++; total_forks++; write_unlock_irq(&tasklist_lock);