kernel/git/stable/linux.git/fs/proc/uptime.c, branch linux-3.5.y

Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip

2011-12-19T18:23:15+00:00

Conflicts: drivers/cpufreq/cpufreq_conservative.c drivers/cpufreq/cpufreq_ondemand.c drivers/macintosh/rack-meter.c fs/proc/stat.c fs/proc/uptime.c kernel/sched/core.c

[S390] fix cputime overflow in uptime_proc_show

2011-12-15T13:56:19+00:00

For 32-bit architectures using standard jiffies the idletime calculation in uptime_proc_show will quickly overflow. It takes (2^32 / HZ) seconds of idle-time, or e.g. 12.45 days with no load on a quad-core with HZ=1000. Switch to 64-bit calculations. Cc: stable@vger.kernel.org Cc: Michael Abbott Signed-off-by: Martin Schwidefsky

[S390] cputime: add sparse checking and cleanup

2011-12-15T13:56:19+00:00

Make cputime_t and cputime64_t nocast to enable sparse checking to detect incorrect use of cputime. Drop the cputime macros for simple scalar operations. The conversion macros are still needed. Signed-off-by: Martin Schwidefsky

sched/accounting: Change cpustat fields to an array

2011-12-06T08:06:38+00:00

This patch changes fields in cpustat from a structure, to an u64 array. Math gets easier, and the code is more flexible. Signed-off-by: Glauber Costa Reviewed-by: KAMEZAWA Hiroyuki Cc: Linus Torvalds Cc: Andrew Morton Cc: Paul Tuner Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/1322498719-2255-2-git-send-email-glommer@parallels.com Signed-off-by: Ingo Molnar

[PATCH] Fix idle time field in /proc/uptime

2009-09-24T08:16:24+00:00

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 Signed-off-by: Martin Schwidefsky

Revert "proc: revert /proc/uptime to ->read_proc hook"

2009-03-30T21:14:58+00:00

This reverts commit 6c87df37dcb9c6c33923707fa5191e0a65874d60. proc files implemented through seq_file do pread(2) now. Signed-off-by: Alexey Dobriyan

proc: revert /proc/uptime to ->read_proc hook

2008-10-27T19:56:56+00:00

Turned out some VMware userspace does pread(2) on /proc/uptime, but seqfiles currently don't allow pread() resulting in -ESPIPE. Seqfiles in theory can do pread(), but this can be a long story, so revert to ->read_proc until then. http://bugzilla.kernel.org/show_bug.cgi?id=11856 Signed-off-by: Alexey Dobriyan

proc: switch /proc/uptime to seq_file

2008-10-23T09:48:01+00:00

and move it to fs/proc/uptime.c while I'm at it. Signed-off-by: Alexey Dobriyan