diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /fs/proc/proc_misc.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'fs/proc/proc_misc.c')
| -rw-r--r-- | fs/proc/proc_misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index d24f65b50..5863e45ac 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -293,8 +293,8 @@ static int kstat_read_proc(char *page, char **start, off_t off, "page %u %u\n" "swap %u %u\n" "intr %u", - kstat.pgpgin, - kstat.pgpgout, + kstat.pgpgin >> 1, + kstat.pgpgout >> 1, kstat.pswpin, kstat.pswpout, sum |