diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2012-09-08 12:07:29 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2012-09-25 09:42:59 -0400 |
| commit | 9dc16f64e84fea59d6af6bb5da59603b369ff05c (patch) | |
| tree | 78e8e15457d989bf4cec3e73e2e605de3ee6234f | |
| parent | 5bf412cd769eb5830fb3716d4b2b222b6a5515ff (diff) | |
ia64: Reuse system and user vtime accounting functions on task switch
To avoid code duplication.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
| -rw-r--r-- | arch/ia64/kernel/time.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 351df5850309..80ff9acc5edf 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
| @@ -104,20 +104,15 @@ void vtime_task_switch(struct task_struct *prev) | |||
| 104 | { | 104 | { |
| 105 | struct thread_info *pi = task_thread_info(prev); | 105 | struct thread_info *pi = task_thread_info(prev); |
| 106 | struct thread_info *ni = task_thread_info(current); | 106 | struct thread_info *ni = task_thread_info(current); |
| 107 | cputime_t delta_stime; | ||
| 108 | __u64 now; | ||
| 109 | |||
| 110 | now = ia64_get_itc(); | ||
| 111 | 107 | ||
| 112 | delta_stime = cycle_to_cputime(pi->ac_stime + (now - pi->ac_stamp)); | ||
| 113 | if (idle_task(smp_processor_id()) != prev) | 108 | if (idle_task(smp_processor_id()) != prev) |
| 114 | account_system_time(prev, 0, delta_stime, delta_stime); | 109 | vtime_account_system(prev); |
| 115 | else | 110 | else |
| 116 | account_idle_time(delta_stime); | 111 | vtime_account_idle(prev); |
| 117 | 112 | ||
| 118 | vtime_account_user(prev); | 113 | vtime_account_user(prev); |
| 119 | 114 | ||
| 120 | pi->ac_stamp = ni->ac_stamp = now; | 115 | pi->ac_stamp = ni->ac_stamp; |
| 121 | ni->ac_stime = ni->ac_utime = 0; | 116 | ni->ac_stime = ni->ac_utime = 0; |
| 122 | } | 117 | } |
| 123 | 118 | ||
