The patch titled Subject: revert procfs-do-not-confuse-jiffies-with-cputime64_t has been added to the -mm tree. Its filename is revert-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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: revert procfs-do-not-confuse-jiffies-with-cputime64_t 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, 2 insertions(+), 8 deletions(-) diff -puN arch/ia64/include/asm/cputime.h~revert-procfs-do-not-confuse-jiffies-with-cputime64_t arch/ia64/include/asm/cputime.h --- a/arch/ia64/include/asm/cputime.h~revert-procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/arch/ia64/include/asm/cputime.h @@ -60,7 +60,6 @@ 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~revert-procfs-do-not-confuse-jiffies-with-cputime64_t arch/powerpc/include/asm/cputime.h --- a/arch/powerpc/include/asm/cputime.h~revert-procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/arch/powerpc/include/asm/cputime.h @@ -150,8 +150,6 @@ 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~revert-procfs-do-not-confuse-jiffies-with-cputime64_t arch/s390/include/asm/cputime.h --- a/arch/s390/include/asm/cputime.h~revert-procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/arch/s390/include/asm/cputime.h @@ -87,8 +87,6 @@ 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~revert-procfs-do-not-confuse-jiffies-with-cputime64_t fs/proc/stat.c --- a/fs/proc/stat.c~revert-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 = usecs_to_cputime64(idle_time); + idle = nsecs_to_jiffies64(1000 * 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 = usecs_to_cputime64(iowait_time); + iowait = nsecs_to_jiffies64(1000 * iowait_time); return iowait; } diff -puN include/asm-generic/cputime.h~revert-procfs-do-not-confuse-jiffies-with-cputime64_t include/asm-generic/cputime.h --- a/include/asm-generic/cputime.h~revert-procfs-do-not-confuse-jiffies-with-cputime64_t +++ a/include/asm-generic/cputime.h @@ -40,7 +40,6 @@ 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: revert procfs-do-not-confuse-jiffies-with-cputime64_t Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch revert-procfs-do-not-confuse-jiffies-with-cputime64_t.patch linux-next.patch linux-next-git-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-fix.patch mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix.patch drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes.patch drivers-platform-x86-sony-laptopc-fix-scancodes-v2-checkpatch-fixes.patch slub-document-setting-min-order-with-debug_guardpage_minorder-0-checkpatch-fixes.patch mm.patch mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes.patch mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix.patch mm-more-intensive-memory-corruption-debug-fix.patch mm-exclude-reserved-pages-from-dirtyable-memory-fix.patch mm-simplify-find_vma_prev-fix.patch mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes.patch leds-add-driver-for-tca6507-led-controller.patch checkpatch-improve-memset-and-min-max-with-cast-checking-fix.patch checkpatch-catch-all-occurances-of-type-and-cast-spacing-errors-per-line-checkpatch-fixes.patch drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix.patch drivers-rtc-rtc-mxcc-make-alarm-work-fix.patch rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes.patch rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-v3-checkpatch-fixes.patch mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes.patch memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix.patch memcg-clear-pc-mem_cgorup-if-necessary-fix.patch memcg-clear-pc-mem_cgorup-if-necessary-fix-2-fix.patch memcg-simplify-lru-handling-by-new-rule-fix.patch procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes.patch workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix.patch kexec-remove-kmsg_dump_kexec.patch panic-dont-print-redundant-backtraces-on-oops-fix.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch memstick-add-support-for-legacy-memorysticks-fix.patch dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes.patch selftests-new-very-basic-kernel-selftests-directory.patch c-r-procfs-add-start_data-end_data-start_brk-members-to-proc-pid-stat-v4-fix.patch c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix.patch fixed-use-of-rounddown_pow_of_two-in-ramoops.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.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