Commit 2cc9d020 authored by Oleg Drokin's avatar Oleg Drokin

[PATCH] fix HZ=100 case with 64 bit jiffies

The updates to use 64-bit jiffies broke fs/proc/proc_misc.c for
architectures still using a 100 Hz clocktick (e.g.  UML)
parent 5ad0c942
...@@ -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