https://source.android.com/security/bulletin/2018-11-01

No kernel security patches for ASB-2018-11, however there
were some from previous ASBs that are now upstream and in
android common kernels

CVE-2018-9363 from ASB-2018-06
CVE-2017-0749 from ASB-2017-08
CVE-2017-0627 from ASB-2017-05
CVE-2017-0564 from ASB-2017-04
CVE-2017-13293 from ASB-2018-04
kernel/sched: Fix up 4.9.135 merge

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>
1 file changed