diff options
Diffstat (limited to 'arch/ia64/kernel/time.c')
-rw-r--r-- | arch/ia64/kernel/time.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 65c10a42c88f..4ee367817049 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -93,13 +93,11 @@ void ia64_account_on_switch(struct task_struct *prev, struct task_struct *next) | |||
93 | now = ia64_get_itc(); | 93 | now = ia64_get_itc(); |
94 | 94 | ||
95 | delta_stime = cycle_to_cputime(pi->ac_stime + (now - pi->ac_stamp)); | 95 | delta_stime = cycle_to_cputime(pi->ac_stime + (now - pi->ac_stamp)); |
96 | account_system_time(prev, 0, delta_stime); | 96 | account_system_time(prev, 0, delta_stime, delta_stime); |
97 | account_system_time_scaled(prev, delta_stime); | ||
98 | 97 | ||
99 | if (pi->ac_utime) { | 98 | if (pi->ac_utime) { |
100 | delta_utime = cycle_to_cputime(pi->ac_utime); | 99 | delta_utime = cycle_to_cputime(pi->ac_utime); |
101 | account_user_time(prev, delta_utime); | 100 | account_user_time(prev, delta_utime, delta_utime); |
102 | account_user_time_scaled(prev, delta_utime); | ||
103 | } | 101 | } |
104 | 102 | ||
105 | pi->ac_stamp = ni->ac_stamp = now; | 103 | pi->ac_stamp = ni->ac_stamp = now; |
@@ -122,8 +120,7 @@ void account_system_vtime(struct task_struct *tsk) | |||
122 | now = ia64_get_itc(); | 120 | now = ia64_get_itc(); |
123 | 121 | ||
124 | delta_stime = cycle_to_cputime(ti->ac_stime + (now - ti->ac_stamp)); | 122 | delta_stime = cycle_to_cputime(ti->ac_stime + (now - ti->ac_stamp)); |
125 | account_system_time(tsk, 0, delta_stime); | 123 | account_system_time(tsk, 0, delta_stime, delta_stime); |
126 | account_system_time_scaled(tsk, delta_stime); | ||
127 | ti->ac_stime = 0; | 124 | ti->ac_stime = 0; |
128 | 125 | ||
129 | ti->ac_stamp = now; | 126 | ti->ac_stamp = now; |
@@ -143,8 +140,7 @@ void account_process_tick(struct task_struct *p, int user_tick) | |||
143 | 140 | ||
144 | if (ti->ac_utime) { | 141 | if (ti->ac_utime) { |
145 | delta_utime = cycle_to_cputime(ti->ac_utime); | 142 | delta_utime = cycle_to_cputime(ti->ac_utime); |
146 | account_user_time(p, delta_utime); | 143 | account_user_time(p, delta_utime, delta_utime); |
147 | account_user_time_scaled(p, delta_utime); | ||
148 | ti->ac_utime = 0; | 144 | ti->ac_utime = 0; |
149 | } | 145 | } |
150 | } | 146 | } |