summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 17:46:21 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 17:46:21 +1100
commit4e12cc1891a11375709ee3dfbaf5bf989ff40a70 (patch)
treefd8d42508af53fbbda2ee55910f5ba08da3dd3f6 /include
parent50434bc192f825dcb140d5aca5261cf81778b157 (diff)
parentf2ae3f3f232ddcf35ba34acbee9b534dffff6cc7 (diff)
Merge commit 'sparseirq/auto-sparseirq-next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/irq.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index ab70fd604d3a..1cde9dfcb0dd 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -144,8 +144,8 @@ struct irq_chip {
* @depth: disable-depth, for nested irq_disable() calls
* @wake_depth: enable depth, for multiple set_irq_wake() callers
* @irq_count: stats field to detect stalled irqs
- * @irqs_unhandled: stats field for spurious unhandled interrupts
* @last_unhandled: aging timer for unhandled count
+ * @irqs_unhandled: stats field for spurious unhandled interrupts
* @lock: locking for SMP
* @affinity: IRQ affinity on SMP
* @cpu: cpu index useful for balancing
@@ -166,8 +166,8 @@ struct irq_desc {
unsigned int depth; /* nested irq disables */
unsigned int wake_depth; /* nested wake enables */
unsigned int irq_count; /* For detecting broken IRQs */
- unsigned int irqs_unhandled;
unsigned long last_unhandled; /* Aging timer for unhandled count */
+ unsigned int irqs_unhandled;
spinlock_t lock;
#ifdef CONFIG_SMP
cpumask_t affinity;