1 files changed, 18 insertions, 13 deletions

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 6d8b30114961..fc4e906aedbd 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -16,10 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 
-#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM)
-#include <asm/dyntick.h>
-#endif
-
 #include "internals.h"
 
 /**
@@ -133,17 +129,10 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
         irqreturn_t ret, retval = IRQ_NONE;
         unsigned int status = 0;
 
-#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM)
-        if (!(action->flags & SA_TIMER) && system_timer->dyn_tick != NULL) {
-                write_seqlock(&xtime_lock);
-                if (system_timer->dyn_tick->state & DYN_TICK_ENABLED)
-                        system_timer->dyn_tick->handler(irq, 0, regs);
-                write_sequnlock(&xtime_lock);
-        }
-#endif
+        handle_dynamic_tick(action);
 
         if (!(action->flags & IRQF_DISABLED))
-                local_irq_enable();
+                local_irq_enable_in_hardirq();
 
         do {
                 ret = action->handler(irq, action->dev_id, regs);
@@ -260,3 +249,19 @@ out:
         return 1;
 }
 
+#ifdef CONFIG_TRACE_IRQFLAGS
+
+/*
+ * lockdep: we want to handle all irq_desc locks as a single lock-class:
+ */
+static struct lock_class_key irq_desc_lock_class;
+
+void early_init_irq_lock_class(void)
+{
+        int i;
+
+        for (i = 0; i < NR_IRQS; i++)
+                lockdep_set_class(&irq_desc[i].lock, &irq_desc_lock_class);
+}
+
+#endif