diff options
| -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); } |