The patch titled Subject: procfs: do not confuse jiffies with cputime64_t has been added to the -mm tree. Its filename is procfs-do-not-confuse-jiffies-with-cputime64_t.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andreas Schwab <schwab@xxxxxxxxxxxxxx> Subject: procfs: do not confuse jiffies with cputime64_t get_{idle,iowait}_time are supposed to return cputime64_t values, not jiffies. Add usecs_to_cputime64 for this. Signed-off-by: Andreas Schwab <schwab@xxxxxxxxxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: "Artem S. Tashkinov" <t.artem@xxxxxxxxxxxx> Cc: Dave Jones <davej@xxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/ia64/include/asm/cputime.h | 1 + arch/powerpc/include/asm/cputime.h | 2 ++ arch/s390/include/asm/cputime.h | 2 ++ fs/proc/stat.c | 4 ++-- include/asm-generic/cputime.h | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff -puN arch/ia64/include/asm/cputime.h~procfs-do-not-confuse-jiffies-with-cputime64_t arch/ia64/include/asm/cputime.h --- a/arch/ia64/include/asm/cputime.h~procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/arch/ia64/include/asm/cputime.h @@ -60,6 +60,7 @@ typedef u64 cputime64_t; */ #define cputime_to_usecs(__ct) ((__ct) / NSEC_PER_USEC) #define usecs_to_cputime(__usecs) ((__usecs) * NSEC_PER_USEC) +#define usecs_to_cputime64(__usecs) usecs_to_cputime(__usecs) /* * Convert cputime <-> seconds diff -puN arch/powerpc/include/asm/cputime.h~procfs-do-not-confuse-jiffies-with-cputime64_t arch/powerpc/include/asm/cputime.h --- a/arch/powerpc/include/asm/cputime.h~procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/arch/powerpc/include/asm/cputime.h @@ -150,6 +150,8 @@ static inline cputime_t usecs_to_cputime return ct; } +#define usecs_to_cputime64(us) usecs_to_cputime(us) + /* * Convert cputime <-> seconds */ diff -puN arch/s390/include/asm/cputime.h~procfs-do-not-confuse-jiffies-with-cputime64_t arch/s390/include/asm/cputime.h --- a/arch/s390/include/asm/cputime.h~procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/arch/s390/include/asm/cputime.h @@ -87,6 +87,8 @@ usecs_to_cputime(const unsigned int m) return (cputime_t) m * 4096; } +#define usecs_to_cputime64(m) usecs_to_cputime(m) + /* * Convert cputime to milliseconds and back. */ diff -puN fs/proc/stat.c~procfs-do-not-confuse-jiffies-with-cputime64_t fs/proc/stat.c --- a/fs/proc/stat.c~procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/fs/proc/stat.c @@ -32,7 +32,7 @@ static cputime64_t get_idle_time(int cpu idle = kstat_cpu(cpu).cpustat.idle; idle = cputime64_add(idle, arch_idle_time(cpu)); } else - idle = nsecs_to_jiffies64(1000 * idle_time); + idle = usecs_to_cputime64(idle_time); return idle; } @@ -46,7 +46,7 @@ static cputime64_t get_iowait_time(int c /* !NO_HZ so we can rely on cpustat.iowait */ iowait = kstat_cpu(cpu).cpustat.iowait; else - iowait = nsecs_to_jiffies64(1000 * iowait_time); + iowait = usecs_to_cputime64(iowait_time); return iowait; } diff -puN include/asm-generic/cputime.h~procfs-do-not-confuse-jiffies-with-cputime64_t include/asm-generic/cputime.h --- a/include/asm-generic/cputime.h~procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/include/asm-generic/cputime.h @@ -40,6 +40,7 @@ typedef u64 cputime64_t; */ #define cputime_to_usecs(__ct) jiffies_to_usecs(__ct) #define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs) +#define usecs_to_cputime64(__msecs) nsecs_to_jiffies64((__msecs) * 1000) /* * Convert cputime to seconds and back. _ Subject: Subject: procfs: do not confuse jiffies with cputime64_t Patches currently in -mm which might be from schwab@xxxxxxxxxxxxxx are procfs-do-not-confuse-jiffies-with-cputime64_t.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html