aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/time.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kernel/time.c')
-rw-r--r--arch/ia64/kernel/time.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 8c73643f2d66..046ca89efc05 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -24,6 +24,7 @@
24#include <asm/machvec.h> 24#include <asm/machvec.h>
25#include <asm/delay.h> 25#include <asm/delay.h>
26#include <asm/hw_irq.h> 26#include <asm/hw_irq.h>
27#include <asm/paravirt.h>
27#include <asm/ptrace.h> 28#include <asm/ptrace.h>
28#include <asm/sal.h> 29#include <asm/sal.h>
29#include <asm/sections.h> 30#include <asm/sections.h>
@@ -48,6 +49,15 @@ EXPORT_SYMBOL(last_cli_ip);
48 49
49#endif 50#endif
50 51
52#ifdef CONFIG_PARAVIRT
53static void
54paravirt_clocksource_resume(void)
55{
56 if (pv_time_ops.clocksource_resume)
57 pv_time_ops.clocksource_resume();
58}
59#endif
60
51static struct clocksource clocksource_itc = { 61static struct clocksource clocksource_itc = {
52 .name = "itc", 62 .name = "itc",
53 .rating = 350, 63 .rating = 350,
@@ -56,6 +66,9 @@ static struct clocksource clocksource_itc = {
56 .mult = 0, /*to be calculated*/ 66 .mult = 0, /*to be calculated*/
57 .shift = 16, 67 .shift = 16,
58 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 68 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
69#ifdef CONFIG_PARAVIRT
70 .resume = paravirt_clocksource_resume,
71#endif
59}; 72};
60static struct clocksource *itc_clocksource; 73static struct clocksource *itc_clocksource;
61 74
@@ -156,6 +169,9 @@ timer_interrupt (int irq, void *dev_id)
156 169
157 profile_tick(CPU_PROFILING); 170 profile_tick(CPU_PROFILING);
158 171
172 if (paravirt_do_steal_accounting(&new_itm))
173 goto skip_process_time_accounting;
174
159 while (1) { 175 while (1) {
160 update_process_times(user_mode(get_irq_regs())); 176 update_process_times(user_mode(get_irq_regs()));
161 177
@@ -185,6 +201,8 @@ timer_interrupt (int irq, void *dev_id)
185 local_irq_disable(); 201 local_irq_disable();
186 } 202 }
187 203
204skip_process_time_accounting:
205
188 do { 206 do {
189 /* 207 /*
190 * If we're too close to the next clock tick for 208 * If we're too close to the next clock tick for
@@ -334,6 +352,11 @@ ia64_init_itm (void)
334 */ 352 */
335 clocksource_itc.rating = 50; 353 clocksource_itc.rating = 50;
336 354
355 paravirt_init_missing_ticks_accounting(smp_processor_id());
356
357 /* avoid softlock up message when cpu is unplug and plugged again. */
358 touch_softlockup_watchdog();
359
337 /* Setup the CPU local timer tick */ 360 /* Setup the CPU local timer tick */
338 ia64_cpu_local_tick(); 361 ia64_cpu_local_tick();
339 362