From 22b18281457de02c9c830504fd4d48726db86f31 Mon Sep 17 00:00:00 2001 From: Blagovest Kolenichev Date: Mon, 6 Nov 2017 15:07:22 -0800 Subject: [PATCH] sched: restore discarded ifdef CONFIG_SCHED_WALT code Code closed in ifdef CONFIG_SCHED_WALT blocks is not used in msm-4.4 builds, hence in order to be as much as closer to upstream and subsequently to have less merge conflicts in the future, let's restore this code. Restore below CONFIG_SCHED_WALT changes in file [1]: be832f6 sched: walt: Leverage existing ^^^^^^^ Discarded in dbad9b8. efb86bd sched: Introduce Window Assisted Load Tracking (WALT) ^^^^^^^ Restore only the block, which is modified by be832f6. Discarded in efbe378. dbad9b8 Merge android-4.4@89074de (v4.4.94) into msm-4.4 efbe378 Merge branch 'v4.4-16.09-android-tmp' into lsk-v4.4-16.09-android [1] kernel/sched/sched.h Change-Id: Ifd7e230b3b47dde61abf2472f092ff78d80b7427 Signed-off-by: Blagovest Kolenichev --- kernel/sched/sched.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index c53970b5a8f0..3f17dd1d9d2c 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -794,6 +794,18 @@ struct rq { int curr_top; #endif +#ifdef CONFIG_SCHED_WALT + u64 cumulative_runnable_avg; + u64 window_start; + u64 curr_runnable_sum; + u64 prev_runnable_sum; + u64 nt_curr_runnable_sum; + u64 nt_prev_runnable_sum; + u64 cur_irqload; + u64 avg_irqload; + u64 irqload_ts; +#endif /* CONFIG_SCHED_WALT */ + #ifdef CONFIG_IRQ_TIME_ACCOUNTING u64 prev_irq_time; #endif