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

Commit df6f68df authored by Dietmar Eggemann's avatar Dietmar Eggemann
Browse files

ANDROID: sched, trace: Remove trace event sched_load_avg_cpu 



The functionality of sched_load_avg_cpu can be provided by
sched_load_cfs_rq.
The WALT extension will be included into sched_load_cfs_rq by patch
(ANDROID: trace: Add WALT util signal to trace event sched_load_cfs_rq).

Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Change-Id: I2e3944a6e60a77e3237b7c8cb29cbd840118a6ad
parent 75473ed0

include/trace/events/sched.h

+0 −37
Original line number Diff line number Diff line
@@ -706,43 +706,6 @@ extern bool walt_disabled; 
	}

#endif



/*

 * Tracepoint for accounting cpu root cfs_rq

 */

TRACE_EVENT(sched_load_avg_cpu,



        TP_PROTO(int cpu, struct cfs_rq *cfs_rq),



        TP_ARGS(cpu, cfs_rq),



        TP_STRUCT__entry(

                __field( int,   cpu                             )

                __field( unsigned long, load_avg                )

                __field( unsigned long, util_avg                )

                __field( unsigned long, util_avg_pelt           )

                __field( unsigned long, util_avg_walt           )

        ),



        TP_fast_assign(

                __entry->cpu                    = cpu;

                __entry->load_avg               = cfs_rq->avg.load_avg;

                __entry->util_avg               = cfs_rq->avg.util_avg;

                __entry->util_avg_pelt  = cfs_rq->avg.util_avg;

                __entry->util_avg_walt  = 0;

#ifdef CONFIG_SCHED_WALT

                walt_util(__entry->util_avg_walt, cpu_rq(cpu)->prev_runnable_sum);

                if (!walt_disabled && sysctl_sched_use_walt_cpu_util)

                        __entry->util_avg = __entry->util_avg_walt;

#endif

        ),



        TP_printk("cpu=%d load_avg=%lu util_avg=%lu "

                          "util_avg_pelt=%lu util_avg_walt=%lu",

                  __entry->cpu, __entry->load_avg, __entry->util_avg,

                  __entry->util_avg_pelt, __entry->util_avg_walt)

);





/*

 * Tracepoint for sched_entity load tracking:

 */

kernel/sched/fair.c

+0 −3
Original line number Diff line number Diff line
@@ -2830,9 +2830,6 @@ static inline void cfs_rq_util_change(struct cfs_rq *cfs_rq) 
		 * See cpu_util().

		 */

		cpufreq_update_util(rq, 0);

#ifdef CONFIG_SMP

		trace_sched_load_avg_cpu(cpu_of(rq), cfs_rq);

#endif

	}

}