diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 21:23:18 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 21:23:18 -0400 |
| commit | c2f90e9536887fb76fb6a2aa239a70fc49beda10 (patch) | |
| tree | f87e6b29248c45a92ec6b4b8ffe675bb52e6104b /kernel | |
| parent | f3409f71a76838b1bc985f753eed787a3f17bc2c (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/tsacct.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/tsacct.c b/kernel/tsacct.c index f9cd2561689c..8ebcd8532dfb 100644 --- a/kernel/tsacct.c +++ b/kernel/tsacct.c | |||
| @@ -94,14 +94,14 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p) | |||
| 94 | stats->hiwater_vm = mm->hiwater_vm * PAGE_SIZE / KB; | 94 | stats->hiwater_vm = mm->hiwater_vm * PAGE_SIZE / KB; |
| 95 | mmput(mm); | 95 | mmput(mm); |
| 96 | } | 96 | } |
| 97 | stats->read_char = p->ioac.chr.rchar; | 97 | stats->read_char = p->ioac.rchar; |
| 98 | stats->write_char = p->ioac.chr.wchar; | 98 | stats->write_char = p->ioac.wchar; |
| 99 | stats->read_syscalls = p->ioac.chr.syscr; | 99 | stats->read_syscalls = p->ioac.syscr; |
| 100 | stats->write_syscalls = p->ioac.chr.syscw; | 100 | stats->write_syscalls = p->ioac.syscw; |
| 101 | #ifdef CONFIG_TASK_IO_ACCOUNTING | 101 | #ifdef CONFIG_TASK_IO_ACCOUNTING |
| 102 | stats->read_bytes = p->ioac.blk.read_bytes; | 102 | stats->read_bytes = p->ioac.read_bytes; |
| 103 | stats->write_bytes = p->ioac.blk.write_bytes; | 103 | stats->write_bytes = p->ioac.write_bytes; |
| 104 | stats->cancelled_write_bytes = p->ioac.blk.cancelled_write_bytes; | 104 | stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes; |
| 105 | #else | 105 | #else |
| 106 | stats->read_bytes = 0; | 106 | stats->read_bytes = 0; |
| 107 | stats->write_bytes = 0; | 107 | stats->write_bytes = 0; |