sched/irqtime: No need for preempt-safe accessors

We can safely use the preempt-unsafe accessors for irqtime when we
flush its counters to kcpustat as IRQs are disabled at this time.

Signed-off-by: Frederic Weisbecker <[email protected]>
Reviewed-by: Rik van Riel <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Wanpeng Li <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index b93c72d5f64fc686df20d78889f11c6a01bc920a..f1110760ff6cb17a2bfe525ae7023c7ccc21ac46 100644 (file)
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -82,7 +82,7 @@ static cputime_t irqtime_account_hi_update(cputime_t maxtime)
        cputime_t irq_cputime;
 
        local_irq_save(flags);
-       irq_cputime = nsecs_to_cputime64(this_cpu_read(cpu_hardirq_time)) -
+       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;
@@ -97,7 +97,7 @@ static cputime_t irqtime_account_si_update(cputime_t maxtime)
        cputime_t softirq_cputime;
 
        local_irq_save(flags);
-       softirq_cputime = nsecs_to_cputime64(this_cpu_read(cpu_softirq_time)) -
+       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;