projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...
[deliverable/linux.git]
/
kernel
/
irq
/
spurious.c
diff --git
a/kernel/irq/spurious.c
b/kernel/irq/spurious.c
index a6b2bc831dd05be5ee9cbff347566bf410870c26..c66d3f10e85326ab1041a29202047734769b9b10 100644
(file)
--- a/
kernel/irq/spurious.c
+++ b/
kernel/irq/spurious.c
@@
-6,6
+6,7
@@
* This file contains spurious interrupt handling.
*/
* This file contains spurious interrupt handling.
*/
+#include <linux/jiffies.h>
#include <linux/irq.h>
#include <linux/module.h>
#include <linux/kallsyms.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
*/
* 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++;
desc->irqs_unhandled = 1;
else
desc->irqs_unhandled++;
@@
-208,8
+209,8
@@
void note_interrupt(unsigned int irq, struct irq_desc *desc,
* Now kill the IRQ
*/
printk(KERN_EMERG "Disabling IRQ #%d\n", irq);
* Now kill the IRQ
*/
printk(KERN_EMERG "Disabling IRQ #%d\n", irq);
- desc->status |= IRQ_DISABLED;
- desc->depth
= 1
;
+ desc->status |= IRQ_DISABLED
| IRQ_SPURIOUS_DISABLED
;
+ desc->depth
++
;
desc->chip->disable(irq);
}
desc->irqs_unhandled = 0;
desc->chip->disable(irq);
}
desc->irqs_unhandled = 0;
This page took
0.038496 seconds
and
5
git commands to generate.