diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2017-01-31 04:09:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:14:02 +0100 |
| commit | e2339a4caa5e83a3da5e76880d81e8a23e97aa16 (patch) | |
| tree | 25d87a1bcc13287604b0036bdf7d176b23db4ea8 | |
| parent | 4c562529f1ded4801f572e6dfcb464e598ef8f15 (diff) | |
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>
| -rw-r--r-- | arch/ia64/kernel/head.S | 4 | ||||
| -rw-r--r-- | 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 c9b5e942f671..3204fddc439c 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 f15bca4776a7..faa116822c4c 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); } |