Messages in this thread Patch in this message | | | From | Magnus Damm <> | Date | Fri, 16 Jan 2009 15:24:40 +0900 | Subject | [RESEND][PATCH] Free setup_irq() interrupt using free_irq() |
| |
From: Magnus Damm <damm@igel.co.jp>
This patch adds support for using free_irq() on interrupts allocated with setup_irq(). Without this patch the kernel will try to kfree() the struct irqaction passed as argument to setup_irq().
Signed-off-by: Magnus Damm <damm@igel.co.jp> ---
This patch was previously posted to LKML 2008-11-25.
include/linux/interrupt.h | 2 ++ kernel/irq/manage.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
--- 0001/include/linux/interrupt.h +++ work/include/linux/interrupt.h 2008-11-25 19:43:40.000000000 +0900 @@ -48,6 +48,7 @@ * IRQF_IRQPOLL - Interrupt is used for polling (only the interrupt that is * registered first in an shared interrupt is considered for * performance reasons) + * IRQF_STATIC - Interrupt requested with setup_irq(), do not kfree(). */ #define IRQF_DISABLED 0x00000020 #define IRQF_SAMPLE_RANDOM 0x00000040 @@ -57,6 +58,7 @@ #define IRQF_PERCPU 0x00000400 #define IRQF_NOBALANCING 0x00000800 #define IRQF_IRQPOLL 0x00001000 +#define IRQF_STATIC 0x00002000 typedef irqreturn_t (*irq_handler_t)(int, void *); --- 0001/kernel/irq/manage.c +++ work/kernel/irq/manage.c 2008-11-25 19:44:14.000000000 +0900 @@ -509,6 +509,7 @@ int setup_irq(unsigned int irq, struct i { struct irq_desc *desc = irq_to_desc(irq); + act->flags |= IRQF_STATIC; return __setup_irq(irq, desc, act); } @@ -585,7 +586,8 @@ void free_irq(unsigned int irq, void *de local_irq_restore(flags); } #endif - kfree(action); + if (!(action->flags & IRQF_STATIC)) + kfree(action); return; } printk(KERN_ERR "Trying to free already-free IRQ %d\n", irq);
| |