diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/acct.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index ca5619039367..69a40c9777a2 100644 --- a/kernel/acct.c +++ b/kernel/acct.c | |||
@@ -485,12 +485,9 @@ static void do_acct_process(struct file *file) | |||
485 | ac.ac_ppid = current->parent->tgid; | 485 | ac.ac_ppid = current->parent->tgid; |
486 | #endif | 486 | #endif |
487 | 487 | ||
488 | mutex_lock(&tty_mutex); | ||
489 | tty = get_current_tty(); | ||
490 | ac.ac_tty = tty ? old_encode_dev(tty_devnum(tty)) : 0; | ||
491 | mutex_unlock(&tty_mutex); | ||
492 | |||
493 | spin_lock_irq(¤t->sighand->siglock); | 488 | spin_lock_irq(¤t->sighand->siglock); |
489 | tty = current->signal->tty; | ||
490 | ac.ac_tty = tty ? old_encode_dev(tty_devnum(tty)) : 0; | ||
494 | ac.ac_utime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_utime))); | 491 | ac.ac_utime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_utime))); |
495 | ac.ac_stime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_stime))); | 492 | ac.ac_stime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_stime))); |
496 | ac.ac_flag = pacct->ac_flag; | 493 | ac.ac_flag = pacct->ac_flag; |