The callers of the functions performing irqtime kcpustat updates have
IRQS disabled, no need to disable them again.

Cc: Rik van Riel <r...@redhat.com>
Cc: Paolo Bonzini <pbonz...@redhat.com>
Cc: Wanpeng Li <wanpeng...@hotmail.com>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Eric Dumazet <eric.duma...@gmail.com>
Signed-off-by: Frederic Weisbecker <fweis...@gmail.com>
---
 kernel/sched/cputime.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index f111076..d4d12a9 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -78,30 +78,26 @@ EXPORT_SYMBOL_GPL(irqtime_account_irq);
 static cputime_t irqtime_account_hi_update(cputime_t maxtime)
 {
        u64 *cpustat = kcpustat_this_cpu->cpustat;
-       unsigned long flags;
        cputime_t irq_cputime;
 
-       local_irq_save(flags);
        irq_cputime = nsecs_to_cputime64(__this_cpu_read(cpu_hardirq_time)) -
                      cpustat[CPUTIME_IRQ];
        irq_cputime = min(irq_cputime, maxtime);
        cpustat[CPUTIME_IRQ] += irq_cputime;
-       local_irq_restore(flags);
+
        return irq_cputime;
 }
 
 static cputime_t irqtime_account_si_update(cputime_t maxtime)
 {
        u64 *cpustat = kcpustat_this_cpu->cpustat;
-       unsigned long flags;
        cputime_t softirq_cputime;
 
-       local_irq_save(flags);
        softirq_cputime = nsecs_to_cputime64(__this_cpu_read(cpu_softirq_time)) 
-
                          cpustat[CPUTIME_SOFTIRQ];
        softirq_cputime = min(softirq_cputime, maxtime);
        cpustat[CPUTIME_SOFTIRQ] += softirq_cputime;
-       local_irq_restore(flags);
+
        return softirq_cputime;
 }
 
-- 
2.7.0

Reply via email to