From a0c5a2c9ce41f3fd7fbd4ea0aaf9dfcc8f049db7 Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi Date: Fri, 14 Jul 2006 00:24:18 -0700 Subject: [PATCH] --- yaml --- r: 32643 b: refs/heads/master c: a4afee02a5dd4f20c08fca26e9b610e72d0bcbf0 h: refs/heads/master i: 32641: 3bf40ad6412eb2d9a4e6d9c0ee9b617ded3bfebb 32639: 465da752b860fc0a03e369d8786c9c69da4b1c41 v: v3 --- [refs] | 2 +- trunk/kernel/acct.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 32a2adbd8741..eb294ec2b14f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e143475c22036847f898d7e76ba337c1d7dbf6f +refs/heads/master: a4afee02a5dd4f20c08fca26e9b610e72d0bcbf0 diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c index f18e0b8df3e1..2a7c933651c7 100644 --- a/trunk/kernel/acct.c +++ b/trunk/kernel/acct.c @@ -488,7 +488,7 @@ static void do_acct_process(struct file *file) old_encode_dev(tty_devnum(current->signal->tty)) : 0; read_unlock(&tasklist_lock); - spin_lock(¤t->sighand->siglock); + spin_lock_irq(¤t->sighand->siglock); 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; @@ -496,7 +496,7 @@ static void do_acct_process(struct file *file) ac.ac_minflt = encode_comp_t(pacct->ac_minflt); ac.ac_majflt = encode_comp_t(pacct->ac_majflt); ac.ac_exitcode = pacct->ac_exitcode; - spin_unlock(¤t->sighand->siglock); + spin_unlock_irq(¤t->sighand->siglock); ac.ac_io = encode_comp_t(0 /* current->io_usage */); /* %% */ ac.ac_rw = encode_comp_t(ac.ac_io / 1024); ac.ac_swaps = encode_comp_t(0);