| commit | ec49bc1bdc7c6e92873373ff61206c366d63a50a | |
| author | Michael Abbott <michael.abbott@diamond.ac.uk> | |
| Thu, 24 Sep 2009 08:15:19 +0000 (24 10:15 +0200) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Mon, 5 Oct 2009 15:28:03 +0000 (5 08:28 -0700) | ||
| tree | 3982bb6dfa17c9e0ef1698e4cded9fbb1ea738ff | treesnapshot (tar.gz zip) |
| parent | 1590abee1d64ba508d6c3dab7953b4c2fe71c50d | commitdiff |
Fix idle time field in /proc/uptime
commit 96830a57de1197519b62af6a4c9ceea556c18c3d upstream.
Git commit 79741dd changes idle cputime accounting, but unfortunately
the /proc/uptime file hasn't caught up. Here the idle time calculation
from /proc/stat is copied over.
Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 96830a57de1197519b62af6a4c9ceea556c18c3d upstream.
Git commit 79741dd changes idle cputime accounting, but unfortunately
the /proc/uptime file hasn't caught up. Here the idle time calculation
from /proc/stat is copied over.
Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| fs/proc/uptime.c | diffblobblamehistory |