diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-30 14:50:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-30 14:50:13 +0200 |
| commit | cf28dfd89ba01639accfdc2b509849c4656198cf (patch) | |
| tree | 180690eb164838a7ff951354a9e1a5406754961a /kernel/sched | |
| parent | dd85f61b3ad167364f402df62748b4befb27ef7c (diff) | |
| parent | 883ccef355b910398b99dfaf96d40557479a7e9b (diff) | |
| download | linux-next-cf28dfd89ba01639accfdc2b509849c4656198cf.tar.gz | |
Merge branch 'irq/core'
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/cputime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 3b36644fa80a..872e481d5098 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -60,7 +60,7 @@ void irqtime_account_irq(struct task_struct *curr, unsigned int offset) cpu = smp_processor_id(); delta = sched_clock_cpu(cpu) - irqtime->irq_start_time; irqtime->irq_start_time += delta; - pc = preempt_count() - offset; + pc = irq_count() - offset; /* * We do not account for softirq time from ksoftirqd here. @@ -421,7 +421,7 @@ void vtime_task_switch(struct task_struct *prev) void vtime_account_irq(struct task_struct *tsk, unsigned int offset) { - unsigned int pc = preempt_count() - offset; + unsigned int pc = irq_count() - offset; if (pc & HARDIRQ_OFFSET) { vtime_account_hardirq(tsk); |