---

yaml --- r: 355193 b: refs/heads/master c: 73171d1 h: refs/heads/master i: 355191: bc82268 v: v3
git-mirror · Jan 10, 2013 · 38619ca · 38619ca
1 parent 7ef0a2b
commit 38619ca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6e916b82022cba67bdd0ec7df84e2bce2ef3f73
+refs/heads/master: 73171d15873e9246c82aeda5c7fd8ec11cb97be9
diff --git a/trunk/arch/arm/include/asm/mach/irq.h b/trunk/arch/arm/include/asm/mach/irq.h
@@ -22,6 +22,7 @@ extern int show_fiq_list(struct seq_file *, int);
 
 #ifdef CONFIG_MULTI_IRQ_HANDLER
 extern void (*handle_arch_irq)(struct pt_regs *);
+extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
 #endif
 
 /*

diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c
@@ -117,6 +117,16 @@ void __init init_IRQ(void)
 	machine_desc->init_irq();
 }
 
+#ifdef CONFIG_MULTI_IRQ_HANDLER
+void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
+{
+	if (handle_arch_irq)
+		return;
+
+	handle_arch_irq = handle_irq;
+}
+#endif
+
 #ifdef CONFIG_SPARSE_IRQ
 int __init arch_probe_nr_irqs(void)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ extern int show_fiq_list(struct seq_file *, int); @@
     #ifdef CONFIG_MULTI_IRQ_HANDLER
     extern void (*handle_arch_irq)(struct pt_regs *);
+    extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
     #endif
     /*
@@ Expand Down @@