tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: sched: Add rvh for cpu controller cgroup can attach"

Browse Source 
This reverts commit efd8dbe42d as it
conflicts in large ways with the scheduler changes in 6.1-rc1.  If this
is still needed, it can be added back after the 6.1-rc1 merge is
complete.

Bug: 175808144
Cc: Choonghoon Park <choong.park@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2beea9e233ae46289b40162c8e26dc6db919e7a9
This commit is contained in:
Greg Kroah-Hartman
2022-10-12 09:59:00 +02:00
parent 9c6c316e3d
commit 1fcd7476b5
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/android/vendor_hooks.c
-1
View File
@@ -60,7 +60,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_preempt_enable);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_irqs_disable);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_irqs_enable);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_attach);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_can_attach);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_online);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_oops_enter);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_oops_exit);
include/trace/hooks/cgroup.h
-4
View File
@@ -28,10 +28,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_cpu_cgroup_attach,
TP_PROTO(struct cgroup_taskset *tset),
TP_ARGS(tset), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_cpu_cgroup_can_attach,
TP_PROTO(struct cgroup_taskset *tset, int *retval),
TP_ARGS(tset, retval), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_cpu_cgroup_online,
TP_PROTO(struct cgroup_subsys_state *css),
TP_ARGS(css), 1);
kernel/sched/core.c
-3
View File
@@ -10465,9 +10465,6 @@ static int cpu_cgroup_can_attach(struct cgroup_taskset *tset)
if (ret)
break;
}
trace_android_rvh_cpu_cgroup_can_attach(tset, &ret);
return ret;
}