diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-26 10:28:11 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-26 10:28:11 +0000 |
| commit | 83cf1eecfe9afee99d6b86f963187acd414c019d (patch) | |
| tree | 4381bdcc45d81c8c3713630cae9660d770885d96 /arch/arm/kernel/irq.c | |
| parent | f1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd (diff) | |
| parent | 0e341af835fdf553820a1fa98341b93ab32ce466 (diff) | |
| download | blackbird-op-linux-83cf1eecfe9afee99d6b86f963187acd414c019d.tar.gz blackbird-op-linux-83cf1eecfe9afee99d6b86f963187acd414c019d.zip | |
Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/kernel/irq.c')
| -rw-r--r-- | arch/arm/kernel/irq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 36ad3be4692a..6d616333340f 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -35,6 +35,7 @@ #include <linux/list.h> #include <linux/kallsyms.h> #include <linux/proc_fs.h> +#include <linux/ftrace.h> #include <asm/system.h> #include <asm/mach/irq.h> @@ -105,7 +106,8 @@ unlock: * come via this function. Instead, they should provide their * own 'handler' */ -asmlinkage void __exception asm_do_IRQ(unsigned int irq, struct pt_regs *regs) +asmlinkage void __exception_irq_entry +asm_do_IRQ(unsigned int irq, struct pt_regs *regs) { struct pt_regs *old_regs = set_irq_regs(regs); |
