diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 07:54:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 07:54:02 -0800 |
| commit | cf91b824bb2bdea8a47bf6bb94cf3a438683e5eb (patch) | |
| tree | 2598bebb452fbdab0e53b21551e449a949738600 /kernel/irq/spurious.c | |
| parent | b69409279c4c960fcd1575bcf80f2a0ca414ca93 (diff) | |
| parent | 89d694b9dbe769ca1004e01db0ca43964806a611 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq:
genirq: do not leave interupts enabled on free_irq
genirq: spurious.c: use time_* macros
Diffstat (limited to 'kernel/irq/spurious.c')
| -rw-r--r-- | kernel/irq/spurious.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index a6b2bc831dd..088dabbf2d6 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c @@ -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++; |