Merge branch 'rusty-cpumask-parisc' into parisc
[linux-2.6.git] / arch / parisc / kernel / smp.c
index 869197992f9704ad4137889b6890f0506b63bd70..1fd0f0cec037f3fa19ce2630ee7311dc7cc34dbc 100644 (file)
@@ -31,6 +31,7 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/bitops.h>
+#include <linux/ftrace.h>
 
 #include <asm/system.h>
 #include <asm/atomic.h>
@@ -120,7 +121,7 @@ halt_processor(void)
 }
 
 
-irqreturn_t
+irqreturn_t __irq_entry
 ipi_interrupt(int irq, void *dev_id) 
 {
        int this_cpu = smp_processor_id();