diff options
Diffstat (limited to 'arch/ppc64/kernel/time.c')
-rw-r--r-- | arch/ppc64/kernel/time.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 772a465b49f9..33364a7d2cd2 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c | |||
@@ -325,9 +325,7 @@ int timer_interrupt(struct pt_regs * regs) | |||
325 | 325 | ||
326 | irq_enter(); | 326 | irq_enter(); |
327 | 327 | ||
328 | #ifndef CONFIG_PPC_ISERIES | ||
329 | profile_tick(CPU_PROFILING, regs); | 328 | profile_tick(CPU_PROFILING, regs); |
330 | #endif | ||
331 | 329 | ||
332 | lpaca->lppaca.int_dword.fields.decr_int = 0; | 330 | lpaca->lppaca.int_dword.fields.decr_int = 0; |
333 | 331 | ||
@@ -515,6 +513,7 @@ void __init time_init(void) | |||
515 | do_gtod.varp = &do_gtod.vars[0]; | 513 | do_gtod.varp = &do_gtod.vars[0]; |
516 | do_gtod.var_idx = 0; | 514 | do_gtod.var_idx = 0; |
517 | do_gtod.varp->tb_orig_stamp = tb_last_stamp; | 515 | do_gtod.varp->tb_orig_stamp = tb_last_stamp; |
516 | get_paca()->next_jiffy_update_tb = tb_last_stamp + tb_ticks_per_jiffy; | ||
518 | do_gtod.varp->stamp_xsec = xtime.tv_sec * XSEC_PER_SEC; | 517 | do_gtod.varp->stamp_xsec = xtime.tv_sec * XSEC_PER_SEC; |
519 | do_gtod.tb_ticks_per_sec = tb_ticks_per_sec; | 518 | do_gtod.tb_ticks_per_sec = tb_ticks_per_sec; |
520 | do_gtod.varp->tb_to_xs = tb_to_xs; | 519 | do_gtod.varp->tb_to_xs = tb_to_xs; |