2 files changed, 7 insertions, 1 deletions

diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index ed4c4f54e2ae..f5e294040b1c 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -251,8 +251,10 @@ extern void hrtimer_pull(void);
 void smp_pull_timers_interrupt(struct pt_regs *regs)
 {
         ack_APIC_irq();
+        irq_enter();
         TRACE("pull timer interrupt\n");
         hrtimer_pull();
+        irq_exit();
 }
 
 struct smp_ops smp_ops = {
diff --git a/kernel/sched.c b/kernel/sched.c
index cbb1b5f57117..1d7b38a7ff25 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2597,8 +2597,12 @@ void scheduler_ipi(void)
         struct rq *rq = this_rq();
         struct task_struct *list = xchg(&rq->wake_list, NULL);
 
-        if (!list)
+        if (!list) {
+                /* If we don't call irq_enter(), we need to trigger the IRQ
+                 * tracing manually. */
+                ft_irq_fired();
                 return;
+        }
 
         /*
          * Not all reschedule IPI handlers call irq_enter/irq_exit, since