diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-17 09:59:47 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@apollo.(none)> | 2008-10-17 18:13:38 +0200 |
| commit | 719254faa17ffedc87ba0fadb9b34e535c9758d5 (patch) | |
| tree | 6afe1e9f2175aa5394cf6e0fc7c84afef0be3e9b /kernel/softirq.c | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
| download | linux-719254faa17ffedc87ba0fadb9b34e535c9758d5.tar.bz2 | |
NOHZ: unify the nohz function calls in irq_enter()
We have two separate nohz function calls in irq_enter() for no good
reason. Just call a single NOHZ function from irq_enter() and call
the bits in the tick code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 37d67aa2d56f..d410014279e7 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -265,16 +265,12 @@ asmlinkage void do_softirq(void) */ void irq_enter(void) { -#ifdef CONFIG_NO_HZ int cpu = smp_processor_id(); + if (idle_cpu(cpu) && !in_interrupt()) - tick_nohz_stop_idle(cpu); -#endif + tick_check_idle(cpu); + __irq_enter(); -#ifdef CONFIG_NO_HZ - if (idle_cpu(cpu)) - tick_nohz_update_jiffies(); -#endif } #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED |