Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / arch / powerpc / kernel / time.c

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index eaa9d0e6abca6747e72acb6e1f69d5475a7c672b..c9986fd400d89947966d4e94746f8d8c9913b7a2 100644 (file)
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -508,8 +508,6 @@ void timer_interrupt(struct pt_regs * regs)
         */
        may_hard_irq_enable();
 
-       trace_timer_interrupt_entry(regs);
-
        __get_cpu_var(irq_stat).timer_irqs++;
 
 #if defined(CONFIG_PPC32) && defined(CONFIG_PMAC)
@@ -520,6 +518,8 @@ void timer_interrupt(struct pt_regs * regs)
        old_regs = set_irq_regs(regs);
        irq_enter();
 
+       trace_timer_interrupt_entry(regs);
+
        if (test_irq_work_pending()) {
                clear_irq_work_pending();
                irq_work_run();
@@ -544,10 +544,10 @@ void timer_interrupt(struct pt_regs * regs)
        }
 #endif
 
+       trace_timer_interrupt_exit(regs);
+
        irq_exit();
        set_irq_regs(old_regs);
-
-       trace_timer_interrupt_exit(regs);
 }
 
 /*