Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9094a65 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

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: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1474849761-12678-2-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b60205c7

kernel/sched/cputime.c

+2 −2
Original line number Diff line number Diff line
@@ -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;