From: tip-bot for Frederic Weisbecker <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: benh@kernel.crashing.org, fenghua.yu@intel.com,
torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
hpa@zytor.com, heiko.carstens@de.ibm.com, schwidefsky@de.ibm.com,
mingo@kernel.org, tony.luck@intel.com, peterz@infradead.org,
tglx@linutronix.de, wanpeng.li@hotmail.com, sgruszka@redhat.com,
paulus@samba.org, mpe@ellerman.id.au, fweisbec@gmail.com,
riel@redhat.com
Subject: [tip:sched/core] ia64: Convert vtime to use nsec units directly
Date: Wed, 1 Feb 2017 02:04:50 -0800 [thread overview]
Message-ID: <tip-e2339a4caa5e83a3da5e76880d81e8a23e97aa16@git.kernel.org> (raw)
In-Reply-To: <1485832191-26889-30-git-send-email-fweisbec@gmail.com>
Commit-ID: e2339a4caa5e83a3da5e76880d81e8a23e97aa16
Gitweb: http://git.kernel.org/tip/e2339a4caa5e83a3da5e76880d81e8a23e97aa16
Author: Frederic Weisbecker <fweisbec@gmail.com>
AuthorDate: Tue, 31 Jan 2017 04:09:45 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 1 Feb 2017 09:14:02 +0100
ia64: Convert vtime to use nsec units directly
There is no need anymore for this cputime_t midlayer. Let's use nsec
units directly.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-30-git-send-email-fweisbec@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/ia64/kernel/head.S | 4 ++--
arch/ia64/kernel/time.c | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index c9b5e94..3204fdd 100644
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -1031,7 +1031,7 @@ GLOBAL_ENTRY(ia64_native_sched_clock)
END(ia64_native_sched_clock)
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
-GLOBAL_ENTRY(cycle_to_cputime)
+GLOBAL_ENTRY(cycle_to_nsec)
alloc r16=ar.pfs,1,0,0,0
addl r8=THIS_CPU(ia64_cpu_info) + IA64_CPUINFO_NSEC_PER_CYC_OFFSET,r0
;;
@@ -1047,7 +1047,7 @@ GLOBAL_ENTRY(cycle_to_cputime)
;;
shrp r8=r9,r8,IA64_NSEC_PER_CYC_SHIFT
br.ret.sptk.many rp
-END(cycle_to_cputime)
+END(cycle_to_nsec)
#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
#ifdef CONFIG_IA64_BRL_EMU
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index f15bca4..faa1168 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -60,7 +60,7 @@ static struct clocksource *itc_clocksource;
#include <linux/kernel_stat.h>
-extern cputime_t cycle_to_cputime(u64 cyc);
+extern u64 cycle_to_nsec(u64 cyc);
void vtime_flush(struct task_struct *tsk)
{
@@ -68,26 +68,26 @@ void vtime_flush(struct task_struct *tsk)
u64 delta;
if (ti->utime)
- account_user_time(tsk, cputime_to_nsecs(cycle_to_cputime(ti->utime)));
+ account_user_time(tsk, cycle_to_nsec(ti->utime));
if (ti->gtime)
- account_guest_time(tsk, cputime_to_nsecs(cycle_to_cputime(ti->gtime)));
+ account_guest_time(tsk, cycle_to_nsec(ti->gtime));
if (ti->idle_time)
- account_idle_time(cputime_to_nsecs(cycle_to_cputime(ti->idle_time)));
+ account_idle_time(cycle_to_nsec(ti->idle_time));
if (ti->stime) {
- delta = cputime_to_nsecs(cycle_to_cputime(ti->stime));
+ delta = cycle_to_nsec(ti->stime);
account_system_index_time(tsk, delta, CPUTIME_SYSTEM);
}
if (ti->hardirq_time) {
- delta = cputime_to_nsecs(cycle_to_cputime(ti->hardirq_time));
+ delta = cycle_to_nsec(ti->hardirq_time);
account_system_index_time(tsk, delta, CPUTIME_IRQ);
}
if (ti->softirq_time) {
- delta = cputime_to_nsecs(cycle_to_cputime(ti->softirq_time));
+ delta = cycle_to_nsec(ti->softirq_time));
account_system_index_time(tsk, delta, CPUTIME_SOFTIRQ);
}
next prev parent reply other threads:[~2017-02-01 10:06 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 4:46 [GIT PULL] cputime: Convert core use of cputime_t to nsecs Frederic Weisbecker
2017-01-30 14:32 ` Stanislaw Gruszka
2017-01-30 14:56 ` Frederic Weisbecker
2017-01-30 15:29 ` Stanislaw Gruszka
2017-01-31 3:09 ` [PATCH RESEND 01/36] jiffies: Reuse TICK_NSEC instead of NSEC_PER_JIFFY Frederic Weisbecker
2017-02-01 9:49 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 02/36] time: Introduce jiffies64_to_nsecs() Frederic Weisbecker
2017-02-01 9:50 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 03/36] sched: Remove unused INIT_CPUTIME macro Frederic Weisbecker
2017-02-01 9:50 ` [tip:sched/core] sched/cputime: Remove the " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 04/36] cputime: Convert kcpustat to nsecs Frederic Weisbecker
2017-02-01 9:51 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 05/36] macintosh/rack-meter: Remove cputime_t internal use Frederic Weisbecker
2017-02-01 9:51 ` [tip:sched/core] macintosh/rack-meter: Convert cputime64_t use to u64 tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 06/36] cputime: Convert guest time accounting to nsecs Frederic Weisbecker
2017-02-01 9:52 ` [tip:sched/core] sched/cputime: Convert guest time accounting to nsecs (u64) tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 07/36] cputime: Special API to return old-typed cputime Frederic Weisbecker
2017-02-01 9:52 ` [tip:sched/core] sched/cputime: Introduce special task_cputime_t() " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 08/36] cputime: Convert task/group cputime to nsecs Frederic Weisbecker
2017-02-01 9:53 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 09/36] alpha: Convert obsolete cputime_t " Frederic Weisbecker
2017-02-01 9:53 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 10/36] x86: Convert obsolete cputime type " Frederic Weisbecker
2017-02-01 9:54 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 11/36] isdn: " Frederic Weisbecker
2017-02-01 9:54 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 12/36] binfmt: " Frederic Weisbecker
2017-02-01 9:55 ` [tip:sched/core] fs/binfmt: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 13/36] acct: " Frederic Weisbecker
2017-02-01 9:55 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 14/36] delaycct: " Frederic Weisbecker
2017-02-01 9:56 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 15/36] tsacct: " Frederic Weisbecker
2017-02-01 9:56 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 16/36] signal: " Frederic Weisbecker
2017-02-01 9:57 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 17/36] cputime: Increment kcpustat directly on irqtime account Frederic Weisbecker
2017-02-01 9:58 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 18/36] posix-timers: Use TICK_NSEC instead of a dynamically ad-hoc calculated version Frederic Weisbecker
2017-02-01 9:58 ` [tip:sched/core] timers/posix-timers: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 19/36] posix-timers: Convert internals to use nsecs Frederic Weisbecker
2017-02-01 9:59 ` [tip:sched/core] timers/posix-timers: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 20/36] itimer: Convert internal cputime_t units to nsec Frederic Weisbecker
2017-02-01 9:59 ` [tip:sched/core] timers/itimer: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 21/36] sched: Remove temporary cputime_t accessors Frederic Weisbecker
2017-02-01 10:00 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 22/36] cputime: Push time to account_user_time() in nsecs Frederic Weisbecker
2017-02-01 10:00 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 23/36] cputime: Push time to account_steal_time() " Frederic Weisbecker
2017-02-01 10:01 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 24/36] cputime: Push time to account_idle_time() " Frederic Weisbecker
2017-02-01 10:01 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 25/36] cputime: Push time to account_system_time() " Frederic Weisbecker
2017-02-01 10:02 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 26/36] cputime: Complete nsec conversion of tick based accounting Frederic Weisbecker
2017-02-01 10:02 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 27/36] vtime: Return nsecs instead of cputime_t to account Frederic Weisbecker
2017-02-01 10:03 ` [tip:sched/core] sched/cputime, " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 28/36] cputime: Remove jiffies based cputime Frederic Weisbecker
2017-02-01 10:03 ` [tip:sched/core] sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 29/36] ia64: Move nsecs based cputime headers to the last arch using it Frederic Weisbecker
2017-02-01 10:04 ` [tip:sched/core] ia64, sched/cputime: Move the " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 30/36] ia64: Convert vtime to use nsec units directly Frederic Weisbecker
2017-02-01 10:04 ` tip-bot for Frederic Weisbecker [this message]
2017-01-31 3:09 ` [PATCH RESEND 31/36] ia64: Remove unused cputime definitions Frederic Weisbecker
2017-02-01 10:05 ` [tip:sched/core] ia64, sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 32/36] s390: Make arch_cpu_idle_time() to return nsecs Frederic Weisbecker
2017-02-01 10:05 ` [tip:sched/core] s390, sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 33/36] powerpc: Remove unused cputime definitions Frederic Weisbecker
2017-02-01 10:06 ` [tip:sched/core] powerpc, sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 34/36] s390: " Frederic Weisbecker
2017-02-01 10:06 ` [tip:sched/core] s390, sched/cputime: " tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 35/36] cputime: Remove unused nsec_to_cputime Frederic Weisbecker
2017-02-01 10:07 ` [tip:sched/core] sched/cputime: Remove unused nsec_to_cputime() tip-bot for Frederic Weisbecker
2017-01-31 3:09 ` [PATCH RESEND 36/36] cputime: Remove asm generic headers Frederic Weisbecker
2017-02-01 10:07 ` [tip:sched/core] sched/cputime: Remove generic asm headers tip-bot for Frederic Weisbecker
2017-02-06 13:49 ` [GIT PULL] cputime: Convert core use of cputime_t to nsecs Frederic Weisbecker
2017-02-07 8:08 ` Ingo Molnar
2017-02-07 14:06 ` Frederic Weisbecker
2017-02-07 18:41 ` Ingo Molnar
2017-02-21 5:08 ` hejianet
2017-02-22 14:30 ` Frederic Weisbecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-e2339a4caa5e83a3da5e76880d81e8a23e97aa16@git.kernel.org \
--to=tipbot@zytor.com \
--cc=benh@kernel.crashing.org \
--cc=fenghua.yu@intel.com \
--cc=fweisbec@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=schwidefsky@de.ibm.com \
--cc=sgruszka@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=wanpeng.li@hotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).