diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-11-22 09:38:03 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-12-07 17:03:45 -0500 |
commit | 8b5690f8847490c1e3ea47266819833a13621253 (patch) | |
tree | e8eefebed470e7b7c3046b4fdb44fbdb4a021bc9 /arch/mips/pmc-sierra/msp71xx | |
parent | 43064c0c8ee2ada8edd421520c633584d648e100 (diff) |
MIPS: irq: Remove IRQF_DISABLED
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled and we even check
and yell when an interrupt handler returns with interrupts enabled (see
commit [b738a50a: genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
[ralf@linux-mips.org: Fixed up conflicts in
arch/mips/alchemy/common/dbdma.c, arch/mips/cavium-octeon/smp.c and
arch/mips/kernel/perf_event.c.]
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de
linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2835/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pmc-sierra/msp71xx')
-rw-r--r-- | arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 2 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/msp71xx/msp_smp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c index c841f083a7f5..bb57ed9ea2bd 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | |||
@@ -149,7 +149,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq) | |||
149 | CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq->eirq); | 149 | CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq->eirq); |
150 | *CIC_EXT_CFG_REG = cic_ext; | 150 | *CIC_EXT_CFG_REG = cic_ext; |
151 | 151 | ||
152 | return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED, | 152 | return request_irq(hirq->irq, hwbutton_handler, 0, |
153 | hirq->name, hirq); | 153 | hirq->name, hirq); |
154 | } | 154 | } |
155 | 155 | ||
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_smp.c b/arch/mips/pmc-sierra/msp71xx/msp_smp.c index bec17901ff03..10170580a2de 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_smp.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_smp.c | |||
@@ -51,13 +51,13 @@ static irqreturn_t ipi_call_interrupt(int irq, void *dev_id) | |||
51 | 51 | ||
52 | static struct irqaction irq_resched = { | 52 | static struct irqaction irq_resched = { |
53 | .handler = ipi_resched_interrupt, | 53 | .handler = ipi_resched_interrupt, |
54 | .flags = IRQF_DISABLED | IRQF_PERCPU, | 54 | .flags = IRQF_PERCPU, |
55 | .name = "IPI_resched" | 55 | .name = "IPI_resched" |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static struct irqaction irq_call = { | 58 | static struct irqaction irq_call = { |
59 | .handler = ipi_call_interrupt, | 59 | .handler = ipi_call_interrupt, |
60 | .flags = IRQF_DISABLED | IRQF_PERCPU, | 60 | .flags = IRQF_PERCPU, |
61 | .name = "IPI_call" | 61 | .name = "IPI_call" |
62 | }; | 62 | }; |
63 | 63 | ||