From d8a4d0354d3c5ec73896db40b6aa387aa84db119 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 8 Feb 2017 16:37:17 -0800 Subject: [PATCH] ANDROID: sched/walt: use div_u64 instead of do_div Change-Id: I1ff13f1e409051167e2ff5bd18a1299c78a46306 Signed-off-by: Dmitry Shmidt --- include/trace/events/sched.h | 3 ++- kernel/sched/sched.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index d9169f9d783a..12927f326d61 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -1033,7 +1033,8 @@ TRACE_EVENT(walt_update_history, __entry->evt = evt; __entry->demand = p->ravg.demand; __entry->walt_avg = (__entry->demand << 10); - do_div(__entry->walt_avg, walt_ravg_window); + __entry->walt_avg = div_u64(__entry->walt_avg, + walt_ravg_window); __entry->pelt_avg = p->se.avg.util_avg; memcpy(__entry->hist, p->ravg.sum_history, RAVG_HIST_SIZE_MAX * sizeof(u32)); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index e9ed87ea20eb..b6839c2fdb50 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1642,7 +1642,7 @@ static inline unsigned long __cpu_util(int cpu, int delta) #ifdef CONFIG_SCHED_WALT if (!walt_disabled && sysctl_sched_use_walt_cpu_util) { util = cpu_rq(cpu)->prev_runnable_sum << SCHED_CAPACITY_SHIFT; - do_div(util, walt_ravg_window); + util = div_u64(util, walt_ravg_window); } #endif delta += util;