Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 32643
b: refs/heads/master
c: a4afee0
h: refs/heads/master
i:
  32641: 3bf40ad
  32639: 465da75
v: v3
  • Loading branch information
OGAWA Hirofumi authored and Linus Torvalds committed Jul 15, 2006
1 parent 7d9cfd4 commit a0c5a2c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e143475c22036847f898d7e76ba337c1d7dbf6f
refs/heads/master: a4afee02a5dd4f20c08fca26e9b610e72d0bcbf0
4 changes: 2 additions & 2 deletions trunk/kernel/acct.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,15 +488,15 @@ static void do_acct_process(struct file *file)
old_encode_dev(tty_devnum(current->signal->tty)) : 0;
read_unlock(&tasklist_lock);

spin_lock(&current->sighand->siglock);
spin_lock_irq(&current->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;
ac.ac_mem = encode_comp_t(pacct->ac_mem);
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(&current->sighand->siglock);
spin_unlock_irq(&current->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);
Expand Down

0 comments on commit a0c5a2c

Please sign in to comment.