Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6d467a8 authored by Todd Kjos's avatar Todd Kjos
Browse files

ANDROID: sched/core: Fix arm32 allmodconfig build-break



The walt_update_task_ravg tracepoint does a do_div() but passes
an unsigned long * as the first argument instead of the required
uint64_t (see comments in include/asm-generic/div64.h).

This has existed in the android-4.9* kernels since 4.9.40, but
was an unnoticed warning for arm32 builds until kernelci recently
started flagging it as an error in allmoconfig builds.

Fixes: 4328ce34 ("ANDROID: trace/sched: add rq utilization signal for WALT")
Change-Id: I50759bcbdae23ffc4e3e265cd3cf648f7991cd84
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
parent 265229d2
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ TRACE_EVENT(walt_update_task_ravg,
		__field(	 int,	cpu			)
		__field(	u64,	cs			)
		__field(	u64,	ps			)
		__field(unsigned long,	util			)
		__field(	u64,	util			)
		__field(	u32,	curr_window		)
		__field(	u32,	prev_window		)
		__field(	u64,	nt_cs			)
@@ -1008,7 +1008,7 @@ TRACE_EVENT(walt_update_task_ravg,
	),

	TP_printk("wc %llu ws %llu delta %llu event %d cpu %d cur_pid %d task %d (%s) ms %llu delta %llu demand %u sum %u irqtime %llu"
		" cs %llu ps %llu util %lu cur_window %u prev_window %u active_wins %u"
		" cs %llu ps %llu util %llu cur_window %u prev_window %u active_wins %u"
		, __entry->wallclock, __entry->win_start, __entry->delta,
		__entry->evt, __entry->cpu, __entry->cur_pid,
		__entry->pid, __entry->comm, __entry->mark_start,