From 4f148e885b8d681e6732773c64966360fa986d00 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Fri, 8 Dec 2006 02:36:07 -0800 Subject: [PATCH] --- yaml --- r: 43493 b: refs/heads/master c: 7bcfa95e561f11a17720162935e4f704c5d6fda3 h: refs/heads/master i: 43491: 0158052ccccb4eea34a613ea496c4205a42040a8 v: v3 --- [refs] | 2 +- trunk/kernel/acct.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3eaddc700479..1f0bd63e11eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 915935041281c64589e2b7fe38437be22567fb6f +refs/heads/master: 7bcfa95e561f11a17720162935e4f704c5d6fda3 diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c index ca5619039367..69a40c9777a2 100644 --- a/trunk/kernel/acct.c +++ b/trunk/kernel/acct.c @@ -485,12 +485,9 @@ static void do_acct_process(struct file *file) ac.ac_ppid = current->parent->tgid; #endif - mutex_lock(&tty_mutex); - tty = get_current_tty(); - ac.ac_tty = tty ? old_encode_dev(tty_devnum(tty)) : 0; - mutex_unlock(&tty_mutex); - spin_lock_irq(¤t->sighand->siglock); + tty = current->signal->tty; + ac.ac_tty = tty ? old_encode_dev(tty_devnum(tty)) : 0; ac.ac_utime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_utime))); ac.ac_stime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_stime))); ac.ac_flag = pacct->ac_flag;