diff options
author | Tejun Heo <tj@kernel.org> | 2024-09-04 23:41:32 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2024-09-04 23:41:32 +0200 |
commit | 649e980dadee36f961738d054627225542d547a2 (patch) | |
tree | a67f0dc4ea53f03c85f5e0648f83f3ff0e4877f7 /kernel/sched | |
parent | sched_ext: Add a cgroup scheduler which uses flattened hierarchy (diff) | |
parent | selftests/bpf: Do not update vmlinux.h unnecessarily (diff) | |
download | linux-649e980dadee36f961738d054627225542d547a2.tar.xz linux-649e980dadee36f961738d054627225542d547a2.zip |
Merge branch 'bpf/master' into for-6.12
Pull bpf/master to receive baebe9aaba1e ("bpf: allow passing struct
bpf_iter_<type> as kfunc arguments") and related changes in preparation for
the DSQ iterator patchset.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r-- | kernel/sched/stats.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/sched/stats.c b/kernel/sched/stats.c index 78e48f5426ee..eb0cdcd4d921 100644 --- a/kernel/sched/stats.c +++ b/kernel/sched/stats.c @@ -92,16 +92,6 @@ void __update_stats_enqueue_sleeper(struct rq *rq, struct task_struct *p, trace_sched_stat_blocked(p, delta); - /* - * Blocking time is in units of nanosecs, so shift by - * 20 to get a milliseconds-range estimation of the - * amount of time that the task spent sleeping: - */ - if (unlikely(prof_on == SLEEP_PROFILING)) { - profile_hits(SLEEP_PROFILING, - (void *)get_wchan(p), - delta >> 20); - } account_scheduler_latency(p, delta >> 10, 0); } } |