diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /kernel/softirq.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 7110daeb9a90..e7c69a720d69 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -269,10 +269,11 @@ void irq_enter(void) | |||
| 269 | { | 269 | { |
| 270 | int cpu = smp_processor_id(); | 270 | int cpu = smp_processor_id(); |
| 271 | 271 | ||
| 272 | if (idle_cpu(cpu) && !in_interrupt()) | 272 | if (idle_cpu(cpu) && !in_interrupt()) { |
| 273 | __irq_enter(); | ||
| 273 | tick_check_idle(cpu); | 274 | tick_check_idle(cpu); |
| 274 | 275 | } else | |
| 275 | __irq_enter(); | 276 | __irq_enter(); |
| 276 | } | 277 | } |
| 277 | 278 | ||
| 278 | #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED | 279 | #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED |