Commit c4fbc32d authored by Linus Torvalds's avatar Linus Torvalds

Merge penguin:v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux
parents a3a71a19 2cc9d020
...@@ -121,8 +121,7 @@ static int uptime_read_proc(char *page, char **start, off_t off, ...@@ -121,8 +121,7 @@ static int uptime_read_proc(char *page, char **start, off_t off,
} }
#else #else
{ {
unsigned long idle = init_task.times.tms_utime unsigned long idle = init_task.utime + init_task.stime;
+ init_task.times.tms_stime;
len = sprintf(page,"%lu.%02lu %lu.%02lu\n", len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime, (unsigned long) uptime,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment