diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index 9ca7f943d6b9..a23291abd129 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -2480,8 +2480,6 @@ __traceiter_android_vh_cpuidle_psci_enter __traceiter_android_vh_cpuidle_psci_exit __traceiter_android_vh_dump_throttled_rt_tasks - __traceiter_android_vh_force_compatible_post - __traceiter_android_vh_force_compatible_pre __traceiter_android_vh_freq_table_limits __traceiter_android_vh_ftrace_dump_buffer __traceiter_android_vh_ftrace_format_check @@ -2589,8 +2587,6 @@ __tracepoint_android_vh_cpuidle_psci_enter __tracepoint_android_vh_cpuidle_psci_exit __tracepoint_android_vh_dump_throttled_rt_tasks - __tracepoint_android_vh_force_compatible_post - __tracepoint_android_vh_force_compatible_pre __tracepoint_android_vh_freq_table_limits __tracepoint_android_vh_ftrace_dump_buffer __tracepoint_android_vh_ftrace_format_check diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 423bcb7121c6..0a632d52d2a6 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -321,8 +321,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_v4l2subdev_set_fmt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_v4l2subdev_set_frame_interval); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_scmi_timeout_sync); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_new_ilb); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_force_compatible_pre); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_force_compatible_post); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_uid); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_user); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_qos_add_request); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 914f5fdc4709..3b7d022c4328 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -370,14 +370,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_find_new_ilb, TP_PROTO(struct cpumask *nohz_idle_cpus_mask, int *ilb), TP_ARGS(nohz_idle_cpus_mask, ilb), 1); -DECLARE_HOOK(android_vh_force_compatible_pre, - TP_PROTO(void *unused), - TP_ARGS(unused)); - -DECLARE_HOOK(android_vh_force_compatible_post, - TP_PROTO(void *unused), - TP_ARGS(unused)); - DECLARE_RESTRICTED_HOOK(android_rvh_force_compatible_pre, TP_PROTO(void *unused), TP_ARGS(unused), 1); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 37c6ca73b000..36521a857126 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2107,7 +2107,6 @@ void force_compatible_cpus_allowed_ptr(struct task_struct *p) * offlining of the chosen destination CPU, so take the hotplug * lock to ensure that the migration succeeds. */ - trace_android_vh_force_compatible_pre(NULL); trace_android_rvh_force_compatible_pre(NULL); cpus_read_lock(); if (!cpumask_available(new_mask)) @@ -2133,7 +2132,6 @@ out_set_mask: WARN_ON(set_cpus_allowed_ptr(p, override_mask)); out_free_mask: cpus_read_unlock(); - trace_android_vh_force_compatible_post(NULL); trace_android_rvh_force_compatible_post(NULL); free_cpumask_var(new_mask); }