ANDROID: sched/walt: use do_div instead of division operator
Use do_div() instead of "/" operator to fix, undefined references to
"__aeabi_uldivmod" or "__udivdi3", build errors for 32bit ARCHs.
Also in TP_fast_assign(), along with do_div() usage, replace "," with
";" which would have resulted in a syntax error (!), because
'#define TP_fast_assign(args...) args' would have stripped off the ","
and left white space between these two assignments after CPP phase.
Change-Id: I095f9cfb4dd9d58ef20cbb9c58b0711be6df9da3
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 270075c..d9169f9 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -1032,7 +1032,8 @@
__entry->samples = samples;
__entry->evt = evt;
__entry->demand = p->ravg.demand;
- __entry->walt_avg = (__entry->demand << 10) / walt_ravg_window,
+ __entry->walt_avg = (__entry->demand << 10);
+ do_div(__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 d2cdc3a..e9ed87e 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1640,9 +1640,10 @@
unsigned long capacity = capacity_orig_of(cpu);
#ifdef CONFIG_SCHED_WALT
- if (!walt_disabled && sysctl_sched_use_walt_cpu_util)
- util = (cpu_rq(cpu)->prev_runnable_sum << SCHED_CAPACITY_SHIFT) /
- walt_ravg_window;
+ 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);
+ }
#endif
delta += util;
if (delta < 0)