From 1fcd7476b52f2ee7bb7b9cd45ff6a829237b3dda Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 12 Oct 2022 09:59:00 +0200 Subject: [PATCH] Revert "ANDROID: sched: Add rvh for cpu controller cgroup can attach" This reverts commit efd8dbe42d0e5e8a344604cb579a8f6b173aff3d 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 Signed-off-by: Greg Kroah-Hartman Change-Id: I2beea9e233ae46289b40162c8e26dc6db919e7a9 --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/cgroup.h | 4 ---- kernel/sched/core.c | 3 --- 3 files changed, 8 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 9e8b7e7b31db..cf914ca3b544 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -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); diff --git a/include/trace/hooks/cgroup.h b/include/trace/hooks/cgroup.h index fad9df2e5579..b8510d6d7e58 100644 --- a/include/trace/hooks/cgroup.h +++ b/include/trace/hooks/cgroup.h @@ -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); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ae8a1223cc58..4596b423e828 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -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; }