diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 18:41:47 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 18:41:47 +0400 |
| commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
| tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/mti-malta/malta-int.c | |
| parent | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (diff) | |
| parent | d7a887a73dec6c387b02a966a71aac767bbd9ce6 (diff) | |
| download | linux-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.tar.xz | |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/mti-malta/malta-int.c')
| -rw-r--r-- | arch/mips/mti-malta/malta-int.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c index d53ff91b277c..a588b5cef8d2 100644 --- a/arch/mips/mti-malta/malta-int.c +++ b/arch/mips/mti-malta/malta-int.c @@ -322,13 +322,13 @@ static irqreturn_t ipi_call_interrupt(int irq, void *dev_id) static struct irqaction irq_resched = { .handler = ipi_resched_interrupt, - .flags = IRQF_DISABLED|IRQF_PERCPU, + .flags = IRQF_PERCPU, .name = "IPI_resched" }; static struct irqaction irq_call = { .handler = ipi_call_interrupt, - .flags = IRQF_DISABLED|IRQF_PERCPU, + .flags = IRQF_PERCPU, .name = "IPI_call" }; #endif /* CONFIG_MIPS_MT_SMP */ |