Merge "sched: Update tracepoint to include task info"

2 files changed, 3 insertions, 2 deletions

diff --git a/kernel/sched/hmp.c b/kernel/sched/hmp.c
index 70a556f0dd06..ea066ab8376b 100644
--- a/kernel/sched/hmp.c
+++ b/kernel/sched/hmp.c
@@ -2612,7 +2612,8 @@ update_task_rq_cpu_cycles(struct task_struct *p, struct rq *rq, int event,
 
 	p->cpu_cycles = cur_cycles;
 
-	trace_sched_get_task_cpu_cycles(cpu, event, rq->cc.cycles, rq->cc.time);
+	trace_sched_get_task_cpu_cycles(cpu, event, rq->cc.cycles,
+					rq->cc.time, p);
 }
 
 static int
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 7426ae4dced3..c0e3314bf4c2 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1249,7 +1249,7 @@ static inline int cpu_min_power_cost(int cpu)
 	return cpu_rq(cpu)->cluster->min_power_cost;
 }
 
-static inline u32 cpu_cycles_to_freq(u64 cycles, u32 period)
+static inline u32 cpu_cycles_to_freq(u64 cycles, u64 period)
 {
 	return div64_u64(cycles, period);
 }