diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-04 16:48:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-04 16:48:43 -0800 |
| commit | c4fbc32d25f905b1ef78f913a5ac84bfd12ce26a (patch) | |
| tree | f34fd4e2b511d1891a46be0fa8d274d70f51f188 | |
| parent | a3a71a19296bf9289ca334818537a039168f60c6 (diff) | |
| parent | 2cc9d020adf7bb7e8b79262589a7299af2c458dc (diff) | |
Merge penguin:v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/linux
| -rw-r--r-- | fs/proc/proc_misc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 6bf2838dc94f..0b426bc1d760 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -121,8 +121,7 @@ static int uptime_read_proc(char *page, char **start, off_t off, } #else { - unsigned long idle = init_task.times.tms_utime - + init_task.times.tms_stime; + unsigned long idle = init_task.utime + init_task.stime; len = sprintf(page,"%lu.%02lu %lu.%02lu\n", (unsigned long) uptime, |