diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:41:47 +0100 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:41:47 +0100 |
commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/kernel/smtc.c | |
parent | Merge branch 'fixes-for-linus' into mips-for-linux-next (diff) | |
parent | MIPS: Delete unused function add_temporary_entry. (diff) | |
download | linux-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.tar.xz linux-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.zip |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/smtc.c')
-rw-r--r-- | arch/mips/kernel/smtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index b1eea63cc988..0a42ff3ff6a1 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -1130,7 +1130,7 @@ static void ipi_irq_dispatch(void) static struct irqaction irq_ipi = { .handler = ipi_interrupt, - .flags = IRQF_DISABLED | IRQF_PERCPU, + .flags = IRQF_PERCPU, .name = "SMTC_IPI" }; |