From 834285e43db77153533a8e0e2e6d00bdc7a70eea Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Jul 2022 19:10:01 +0200 Subject: [PATCH] Revert "ANDROID: sched: Add vendor hooks for update_topology" This reverts commit 93c605314b4232f9872d58bbf45bc9dbe7220480. There are problems with how the hooks work with the upstream changes in 5.19-rc1. If these are still needed, they can be added back later, but revert them for now to get the build working properly. Bug: 200103201 Cc: Abhijeet Dharmapurikar Cc: Ashay Jaiswal Signed-off-by: Greg Kroah-Hartman Change-Id: Iaf2cc76822240af4fa9e7090b47d5d7a84bff6dc --- drivers/android/vendor_hooks.c | 1 - drivers/base/arch_topology.c | 1 - include/trace/hooks/topology.h | 4 ---- 3 files changed, 6 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 6ba0232e97f5..e530f20aab51 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -123,7 +123,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_replace_next_task_fair); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_wait_for_work); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sync_txn_recvd); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_build_sched_domains); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_update_topology_flags_workfn); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_balance_rt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_pick_next_entity); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_check_preempt_wakeup); diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 108be1de74f2..add1a988cf5c 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -251,7 +251,6 @@ static void update_topology_flags_workfn(struct work_struct *work) { update_topology = 1; rebuild_sched_domains(); - trace_android_vh_update_topology_flags_workfn(NULL); pr_debug("sched_domain hierarchy rebuilt, flags updated\n"); update_topology = 0; } diff --git a/include/trace/hooks/topology.h b/include/trace/hooks/topology.h index 9c7e8c54a85b..2fd5a028d94a 100644 --- a/include/trace/hooks/topology.h +++ b/include/trace/hooks/topology.h @@ -15,10 +15,6 @@ DECLARE_HOOK(android_vh_arch_set_freq_scale, unsigned long max, unsigned long *scale), TP_ARGS(cpus, freq, max, scale)); -DECLARE_HOOK(android_vh_update_topology_flags_workfn, - TP_PROTO(void *unused), - TP_ARGS(unused)); - #endif /* _TRACE_HOOK_TOPOLOGY_H */ /* This part must be outside protection */ #include