cgroup: Reapply the cgroup commits merged in RHEL-34600
JIRA: https://issues.redhat.com/browse/RHEL-36683
MR: !4257 (merged)
CS9 MR #4128 ("cgroup: Backport upstream cgroup commits up to v6.8") and MR #3975 ("Scheduler: rhel9.5 updates") have 2 commits in common.
- commit 79462e8c879a ("sched: don't account throttle time for empty groups")
- commit 677ea015f231 ("sched: add throttled time stat for throttled children")
However, the merging of MR #4128 on top of MR #3975 produced an unexpected result that the 2 new functions (cgroup_local_stat_show & cpu_local_stat_show) introduced by commit 677ea015f231 ("sched: add throttled time stat for throttled children") were duplicated resulting in build failure. This leads to the revert of MR #4128 by the maintainer to address the build problem.
With the merge and revert commits in place, it is now no longer possible to rebase the original MR on top of main. There are now two ways to workaround it. In both case, a new MR and Jiri issue will be needed.
- Reapplying all the patches except the 2 duplicated ones on top of main.
- Revert the revert commit and remove the duplicated functions.
The second alternative is chosen as it will be easier to review and we don't need to duplicate the commits with a different set of git hashes. The first patch is just the revert of the revert as all the code changes had been reviewed before. The second patch removes the duplicated functions.
Signed-off-by: Waiman Long longman@redhat.com