From: Geert Uytterhoeven <geert@linux-m68k.org> To: linux-m68k@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert@linux-m68k.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH 01/28] genirq: Add missing "else" in irq_shutdown() Date: Sun, 11 Sep 2011 13:59:27 +0200 [thread overview] Message-ID: <1315742394-16036-2-git-send-email-geert@linux-m68k.org> (raw) In-Reply-To: <1315742394-16036-1-git-send-email-geert@linux-m68k.org> If an irq_chip provides .irq_shutdown(), but neither of .irq_disable() or .irq_mask(), free_irq() crashes when jumping to NULL. Fix this by only trying .irq_disable() and .irq_mask() if there's no .irq_shutdown() provided. This revives the symmetry with irq_startup(), which tries .irq_startup(), .irq_enable(), and irq_unmask(), and makes it consistent with the comment for irq_chip.irq_shutdown() in <linux/irq.h>, which says: * @irq_shutdown: shut down the interrupt (defaults to ->disable if NULL) This is also how __free_irq() behaved before the big overhaul, cfr. e.g. 3b56f0585fd4c02d047dc406668cb40159b2d340 ("genirq: Remove bogus conditional"), where the core interrupt code always overrode .irq_shutdown() to .irq_disable() if .irq_shutdown() was NULL. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Thomas Gleixner <tglx@linutronix.de> --- v6: Added this changeset --- kernel/irq/chip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index d5a3009..dc5114b 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -178,7 +178,7 @@ void irq_shutdown(struct irq_desc *desc) desc->depth = 1; if (desc->irq_data.chip->irq_shutdown) desc->irq_data.chip->irq_shutdown(&desc->irq_data); - if (desc->irq_data.chip->irq_disable) + else if (desc->irq_data.chip->irq_disable) desc->irq_data.chip->irq_disable(&desc->irq_data); else desc->irq_data.chip->irq_mask(&desc->irq_data); -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert@linux-m68k.org> To: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert@linux-m68k.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH 01/28] genirq: Add missing "else" in irq_shutdown() Date: Sun, 11 Sep 2011 13:59:27 +0200 [thread overview] Message-ID: <1315742394-16036-2-git-send-email-geert@linux-m68k.org> (raw) In-Reply-To: <1315742394-16036-1-git-send-email-geert@linux-m68k.org> If an irq_chip provides .irq_shutdown(), but neither of .irq_disable() or .irq_mask(), free_irq() crashes when jumping to NULL. Fix this by only trying .irq_disable() and .irq_mask() if there's no .irq_shutdown() provided. This revives the symmetry with irq_startup(), which tries .irq_startup(), .irq_enable(), and irq_unmask(), and makes it consistent with the comment for irq_chip.irq_shutdown() in <linux/irq.h>, which says: * @irq_shutdown: shut down the interrupt (defaults to ->disable if NULL) This is also how __free_irq() behaved before the big overhaul, cfr. e.g. 3b56f0585fd4c02d047dc406668cb40159b2d340 ("genirq: Remove bogus conditional"), where the core interrupt code always overrode .irq_shutdown() to .irq_disable() if .irq_shutdown() was NULL. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Thomas Gleixner <tglx@linutronix.de> --- v6: Added this changeset --- kernel/irq/chip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index d5a3009..dc5114b 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -178,7 +178,7 @@ void irq_shutdown(struct irq_desc *desc) desc->depth = 1; if (desc->irq_data.chip->irq_shutdown) desc->irq_data.chip->irq_shutdown(&desc->irq_data); - if (desc->irq_data.chip->irq_disable) + else if (desc->irq_data.chip->irq_disable) desc->irq_data.chip->irq_disable(&desc->irq_data); else desc->irq_data.chip->irq_mask(&desc->irq_data); -- 1.7.0.4
next prev parent reply other threads:[~2011-09-11 12:00 UTC|newest] Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-09-11 11:59 [PATCH 00/28 v6] m68k: Convert to genirq Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven [this message] 2011-09-11 11:59 ` [PATCH 01/28] genirq: Add missing "else" in irq_shutdown() Geert Uytterhoeven 2011-09-12 7:53 ` Thomas Gleixner 2011-09-12 7:53 ` Thomas Gleixner 2011-09-11 11:59 ` [PATCH 02/28] ide-{cd,floppy,tape}: Do not include <linux/irq.> Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-12 9:59 ` Sergei Shtylyov 2011-09-12 9:59 ` Sergei Shtylyov 2011-09-12 9:59 ` Sergei Shtylyov 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 03/28] keyboard: " Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 04/28] m68k/irq: Rename irq_controller to irq_chip Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 05/28] m68k/irq: Kill irq_node_t typedef, always use struct irq_node Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 06/28] m68k/irq: Rename irq_node to irq_data Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 07/28] m68k/irq: Switch irq_chip methods to "struct irq_data *data" Geert Uytterhoeven 2011-09-11 13:40 ` Finn Thain 2011-09-11 13:40 ` Finn Thain 2011-09-11 17:46 ` Geert Uytterhoeven 2011-09-11 17:46 ` Geert Uytterhoeven 2011-09-12 2:48 ` Finn Thain 2011-09-12 2:48 ` Finn Thain 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 08/28] m68k/irq: Rename setup_irq() to m68k_setup_irq() and make it static Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 09/28] m68k/irq: Extract irq_set_chip() Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 10/28] m68k/irq: Add m68k_setup_irq_controller() Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 11/28] m68k/irq: Rename {,__}m68k_handle_int() Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 12/28] m68k/irq: Remove obsolete IRQ_FLG_* definitions and users Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 13/28] m68k/irq: Add genirq support Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 14/28] m68k/atari: Convert Atari to genirq Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 15/28] m68k/atari: Remove code and comments about different irq types Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 16/28] m68k/amiga: Refactor amiints.c Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 17/28] m68k/amiga: Convert Amiga to genirq Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 18/28] m68k/amiga: Optimize interrupts using chain handlers Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 19/28] m68k/mac: Convert Mac to genirq Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 20/28] m68k/mac: Optimize interrupts using chain handlers Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 21/28] m68k/hp300: Convert HP9000/300 and HP9000/400 to genirq Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 22/28] m68k/vme: Convert VME " Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 23/28] m68k/apollo: Convert Apollo " Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 24/28] m68k/sun3: Use the kstat_irqs_cpu() wrapper Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-12 17:38 ` Sam Creasey 2011-09-12 17:38 ` Sam Creasey 2011-09-11 11:59 ` [PATCH 25/28] m68k/sun3: Convert Sun3/3x to genirq Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 26/28] m68k/q40: Convert Q40/Q60 " Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 27/28] m68k/irq: Remove obsolete m68k irq framework Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-11 11:59 ` [PATCH 28/28] m68k/irq: Remove obsolete support for user vector interrupt fixups Geert Uytterhoeven 2011-09-11 11:59 ` Geert Uytterhoeven 2011-09-13 11:11 ` [PATCH 00/28 v6] m68k: Convert to genirq Finn Thain 2011-09-13 11:11 ` Finn Thain 2011-09-13 11:18 ` Geert Uytterhoeven 2011-09-13 17:26 ` Finn Thain 2011-09-13 17:26 ` Finn Thain 2011-09-13 11:18 ` Geert Uytterhoeven 2011-10-20 12:18 ` Geert Uytterhoeven 2011-10-20 12:18 ` Geert Uytterhoeven 2011-10-20 13:40 ` Finn Thain 2011-10-20 13:40 ` Finn Thain 2011-10-20 15:02 ` Geert Uytterhoeven 2011-10-20 15:02 ` Geert Uytterhoeven 2011-10-20 15:02 ` Geert Uytterhoeven 2011-10-20 16:03 ` Geert Uytterhoeven 2011-10-20 16:03 ` Geert Uytterhoeven 2011-10-20 23:30 ` Finn Thain 2011-10-20 23:30 ` Finn Thain 2011-10-23 9:49 ` Geert Uytterhoeven 2011-10-23 9:49 ` Geert Uytterhoeven 2011-10-23 9:49 ` Geert Uytterhoeven 2011-10-23 11:29 ` Greg Ungerer 2011-10-23 11:29 ` Greg Ungerer 2011-10-23 11:29 ` Greg Ungerer 2011-10-23 12:12 ` Geert Uytterhoeven 2011-10-23 12:12 ` Geert Uytterhoeven 2011-10-23 12:12 ` Geert Uytterhoeven 2011-10-20 12:18 ` Geert Uytterhoeven
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1315742394-16036-2-git-send-email-geert@linux-m68k.org \ --to=geert@linux-m68k.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-m68k@vger.kernel.org \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.