genirq fixes for .25
Linus,
please pull genirq fixes for .25 from:
ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq.git
- fix spurious irq after free_irq() bug
- replace open coded jiffies comparison
Thanks,
tglx
---
S.Caglar Onur (1):
genirq: spurious.c: use time_* macros
Thomas Gleixner (1):
genirq: do not leave interupts enabled on free_irq
kernel/irq/chip.c | 20 +++++++++++++++++++- kernel/irq/spurious.c | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-)
kernel/irq/chip.c +19 -1
@@ -246,6 +246,17 @@ static unsigned int default_startup(unsigned int irq) }/* +* default shutdown function +*/ +static void default_shutdown (unsigned int irq) +{ +struct irq_desc *desc = irq_desc + irq; + + desc->chip->mask (irq); + desc->status |=IRQ_MASKED ; +} + +/* * Fixup enable/disable function pointers */ void irq_chip_set_defaults (struct irq_chip *chip)
@@ -256,8 +267,15 @@ void irq_chip_set_defaults(struct irq_chip *chip) chip->disable = default_disable;if (!chip->startup) chip->startup = default_startup; +/* +* We use chip->disable, when the user provided its own. When +* we have default_disable set for chip->disable, then we need +* to use default_shutdown, otherwise the irq line is not +* disabled on free_irq(): +*/ if (!chip->shutdown) - chip->shutdown = chip->disable; + chip->shutdown = chip->disable != default_disable ? + chip->disable : default_shutdown;if (!chip->name) chip->name = chip->typename;if (!chip->end)
kernel/irq/spurious.c +2 -1
@@ -6,6 +6,7 @@* This file contains spurious interrupt handling. */ +#include <linux/jiffies.h> #include <linux/irq.h> #include <linux/module.h> #include <linux/kallsyms.h>
@@ -179,7 +180,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,* otherwise the couter becomes a doomsday timer for otherwise * working systems */ -if (jiffies - desc->last_unhandled >HZ /10 ) +if (time_after (jiffies, desc->last_unhandled +HZ /10 )) desc->irqs_unhandled =1 ;else desc->irqs_unhandled++;