diff options
author | Andreas Mohr <andi@rhlx01.fht-esslingen.de> | 2006-06-23 05:05:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:43:05 -0400 |
commit | 83d4e6e7fba0b2a01092f0cf14ba2e33bd1253e9 (patch) | |
tree | 4fa75ffb35970e27762623edbc1f725171d2b0b5 /kernel/irq | |
parent | e6022603b9aa7d61d20b392e69edcdbbc1789969 (diff) |
[PATCH] make noirqdebug/irqfixup __read_mostly, add (un)likely()
Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/spurious.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 7df9abd5ec86..b2fb3c18d06b 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/kallsyms.h> | 11 | #include <linux/kallsyms.h> |
12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
13 | 13 | ||
14 | static int irqfixup; | 14 | static int irqfixup __read_mostly; |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Recovery handler for misrouted interrupts. | 17 | * Recovery handler for misrouted interrupts. |
@@ -136,9 +136,9 @@ static void report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t actio | |||
136 | void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret, | 136 | void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret, |
137 | struct pt_regs *regs) | 137 | struct pt_regs *regs) |
138 | { | 138 | { |
139 | if (action_ret != IRQ_HANDLED) { | 139 | if (unlikely(action_ret != IRQ_HANDLED)) { |
140 | desc->irqs_unhandled++; | 140 | desc->irqs_unhandled++; |
141 | if (action_ret != IRQ_NONE) | 141 | if (unlikely(action_ret != IRQ_NONE)) |
142 | report_bad_irq(irq, desc, action_ret); | 142 | report_bad_irq(irq, desc, action_ret); |
143 | } | 143 | } |
144 | 144 | ||
@@ -152,11 +152,11 @@ void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret, | |||
152 | } | 152 | } |
153 | 153 | ||
154 | desc->irq_count++; | 154 | desc->irq_count++; |
155 | if (desc->irq_count < 100000) | 155 | if (likely(desc->irq_count < 100000)) |
156 | return; | 156 | return; |
157 | 157 | ||
158 | desc->irq_count = 0; | 158 | desc->irq_count = 0; |
159 | if (desc->irqs_unhandled > 99900) { | 159 | if (unlikely(desc->irqs_unhandled > 99900)) { |
160 | /* | 160 | /* |
161 | * The interrupt is stuck | 161 | * The interrupt is stuck |
162 | */ | 162 | */ |
@@ -171,7 +171,7 @@ void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret, | |||
171 | desc->irqs_unhandled = 0; | 171 | desc->irqs_unhandled = 0; |
172 | } | 172 | } |
173 | 173 | ||
174 | int noirqdebug; | 174 | int noirqdebug __read_mostly; |
175 | 175 | ||
176 | int __init noirqdebug_setup(char *str) | 176 | int __init noirqdebug_setup(char *str) |
177 | { | 177 | { |