[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090310102459.23422.80761.sendpatchset@rx1.opensource.se>
Date: Tue, 10 Mar 2009 19:24:59 +0900
From: Magnus Damm <magnus.damm@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Magnus Damm <magnus.damm@...il.com>, lethal@...ux-sh.org,
tglx@...utronix.de, mingo@...e.hu, akpm@...ux-foundation.org
Subject: [PATCH] Free setup_irq() interrupt V2
From: Magnus Damm <damm@...l.co.jp>
This patch adds a __free_irq() function for releasing
interrupts requested with setup_irq().
Without this patch we have no way of releasing such
interrupts since free_irq() today tries to kfree()
the irqaction passed with setup_irq().
Signed-off-by: Magnus Damm <damm@...l.co.jp>
---
Changes since V1:
- break out a __free_irq() function, thanks Ingo!
Why again are we not using struct list_head for the irqaction list?
include/linux/irq.h | 1 +
kernel/irq/manage.c | 40 ++++++++++++++++++++++++++--------------
2 files changed, 27 insertions(+), 14 deletions(-)
--- 0001/include/linux/irq.h
+++ work/include/linux/irq.h 2009-03-10 19:00:34.000000000 +0900
@@ -236,6 +236,7 @@ typedef struct irq_desc irq_desc_t;
#include <asm/hw_irq.h>
extern int setup_irq(unsigned int irq, struct irqaction *new);
+extern struct irqaction *__free_irq(unsigned int irq, void *dev_id);
#ifdef CONFIG_GENERIC_HARDIRQS
--- 0001/kernel/irq/manage.c
+++ work/kernel/irq/manage.c 2009-03-10 19:03:56.000000000 +0900
@@ -551,20 +551,14 @@ int setup_irq(unsigned int irq, struct i
}
/**
- * free_irq - free an interrupt
+ * __free_irq - free an interrupt
* @irq: Interrupt line to free
* @dev_id: Device identity to free
*
- * Remove an interrupt handler. The handler is removed and if the
- * interrupt line is no longer in use by any driver it is disabled.
- * On a shared IRQ the caller must ensure the interrupt is disabled
- * on the card it drives before calling this function. The function
- * does not return until any executing interrupts for this IRQ
- * have completed.
- *
- * This function must not be called from interrupt context.
+ * Used to remove interrupts statically setup by the early boot process.
*/
-void free_irq(unsigned int irq, void *dev_id)
+
+struct irqaction *__free_irq(unsigned int irq, void *dev_id)
{
struct irq_desc *desc = irq_to_desc(irq);
struct irqaction **p;
@@ -573,7 +567,7 @@ void free_irq(unsigned int irq, void *de
WARN_ON(in_interrupt());
if (!desc)
- return;
+ return NULL;
spin_lock_irqsave(&desc->lock, flags);
p = &desc->action;
@@ -623,17 +617,35 @@ void free_irq(unsigned int irq, void *de
local_irq_restore(flags);
}
#endif
- kfree(action);
- return;
+ return action;
}
printk(KERN_ERR "Trying to free already-free IRQ %d\n", irq);
#ifdef CONFIG_DEBUG_SHIRQ
dump_stack();
#endif
spin_unlock_irqrestore(&desc->lock, flags);
- return;
+ return NULL;
}
}
+
+/**
+ * free_irq - free an interrupt allocated with request_irq
+ * @irq: Interrupt line to free
+ * @dev_id: Device identity to free
+ *
+ * Remove an interrupt handler. The handler is removed and if the
+ * interrupt line is no longer in use by any driver it is disabled.
+ * On a shared IRQ the caller must ensure the interrupt is disabled
+ * on the card it drives before calling this function. The function
+ * does not return until any executing interrupts for this IRQ
+ * have completed.
+ *
+ * This function must not be called from interrupt context.
+ */
+void free_irq(unsigned int irq, void *dev_id)
+{
+ kfree(__free_irq(irq, dev_id));
+}
EXPORT_SYMBOL(free_irq);
/**
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists