diff options
| author | Nathan Chancellor <natechancellor@gmail.com> | 2018-10-21 21:43:09 -0700 |
|---|---|---|
| committer | Nathan Chancellor <natechancellor@gmail.com> | 2018-10-23 11:21:16 -0700 |
| commit | 1a557fdc4b7a890898196832811ae4fe8590acb4 (patch) | |
| tree | 4fb3afc83f0c01cc041eec9852ac66f735191499 | |
| parent | 29ae35269353ed513cccddb20e06c56d73e1ab98 (diff) | |
kernel/sched: Fix up 4.9.135 mergeASB-2018-11-05_4.9-p
Commit aee0c9e837c2 ("sched/cputime: Fix ksoftirqd cputime accounting
regression") moved the calls to u64_stats_update_{begin,end} from
irqtime_account_irq into irqtime_account_delta. This was missed in
commit 03fcc2fe7130 ("Merge 4.9.135 into android-4.9"), which only
removed the u64_stats_update_begin call in irqtime_account_irq, because
of a conflict with commit 3a73c96a286f ("ANDROID: sched/walt: Accounting
for number of irqs pending on each core").
Since the two code blocks above and below this statement were gated by
CONFIG_SCHED_WALT, combine them into one at the same time.
Change-Id: I25e9e5a2f063f8df53fa4ff2cfc26dced6ec2b02
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
| -rw-r--r-- | kernel/sched/cputime.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 0b58feafd415..1a15aac3d48c 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -87,10 +87,7 @@ void irqtime_account_irq(struct task_struct *curr) #ifdef CONFIG_SCHED_WALT else account = false; -#endif - u64_stats_update_end(&irqtime->sync); -#ifdef CONFIG_SCHED_WALT if (account) walt_account_irqtime(cpu, curr, delta, wallclock); #endif |