diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-20 14:38:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-20 14:38:55 +0200 |
| commit | dfacc4d6c98b89609250269f518c1f54c30454ef (patch) | |
| tree | e7effbee7bdc85d18f7b26ab9cb5c9f700d1481a /arch/microblaze/kernel/irq.c | |
| parent | f869097e884d8cb65b2bb7831ca57b7dffb66fdd (diff) | |
| parent | 85cb68b27c428d477169f3aa46c72dba103a17bd (diff) | |
| download | linux-dfacc4d6c98b89609250269f518c1f54c30454ef.tar.gz linux-dfacc4d6c98b89609250269f518c1f54c30454ef.tar.bz2 linux-dfacc4d6c98b89609250269f518c1f54c30454ef.zip | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'arch/microblaze/kernel/irq.c')
| -rw-r--r-- | arch/microblaze/kernel/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c index 6f39e2c001f3..8f120aca123d 100644 --- a/arch/microblaze/kernel/irq.c +++ b/arch/microblaze/kernel/irq.c @@ -9,6 +9,7 @@ */ #include <linux/init.h> +#include <linux/ftrace.h> #include <linux/kernel.h> #include <linux/hardirq.h> #include <linux/interrupt.h> @@ -32,7 +33,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map); static u32 concurrent_irq; -void do_IRQ(struct pt_regs *regs) +void __irq_entry do_IRQ(struct pt_regs *regs) { unsigned int irq; struct pt_regs *old_regs = set_irq_regs(regs); |