diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-23 09:52:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-23 09:52:03 +0200 |
| commit | 4bbffe718fe1bfae6176a6fb783c1576b69338e5 (patch) | |
| tree | e4d25102f0d2fa2a3480e03ba7bde45c9958511e /drivers/sh/intc/internals.h | |
| parent | ac742d37180bee83bc433be087b66a17af2883b9 (diff) | |
| parent | 21199f27b430576552b26210b3194a363d7f05cd (diff) | |
| download | linux-4bbffe718fe1bfae6176a6fb783c1576b69338e5.tar.gz linux-4bbffe718fe1bfae6176a6fb783c1576b69338e5.tar.bz2 linux-4bbffe718fe1bfae6176a6fb783c1576b69338e5.zip | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/sh/intc/internals.h')
| -rw-r--r-- | drivers/sh/intc/internals.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h index 7dff08e2a071..6ce7f0d26dcf 100644 --- a/drivers/sh/intc/internals.h +++ b/drivers/sh/intc/internals.h @@ -99,15 +99,7 @@ static inline struct intc_desc_int *get_intc_desc(unsigned int irq) */ static inline void activate_irq(int irq) { -#ifdef CONFIG_ARM - /* ARM requires an extra step to clear IRQ_NOREQUEST, which it - * sets on behalf of every irq_chip. Also sets IRQ_NOPROBE. - */ - set_irq_flags(irq, IRQF_VALID); -#else - /* same effect on other architectures */ - irq_set_noprobe(irq); -#endif + irq_modify_status(irq, IRQ_NOREQUEST, IRQ_NOPROBE); } static inline int intc_handle_int_cmp(const void *a, const void *b) |