diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 10:48:49 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 10:48:49 -0500 |
| commit | 73f56c0d35e6427081a4eabd620d8b8d8a35bd09 (patch) | |
| tree | 9fe1a2577baea03f3a6ec4a5e79f3ff26c4ee0ae /kernel/softirq.c | |
| parent | 0af40a4b1050c050e62eb1dc30b82d5ab22bf221 (diff) | |
| parent | 8501c45cc32c311ae755a2d5ac8c4a5f04908d42 (diff) | |
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
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 |