From a0009ade38735214ec8ff2e55d3b9dead3c5b2f4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Oct 2021 17:33:37 +0200 Subject: [PATCH] Revert half of "ANDROID: cpu/hotplug: create vendor hook for cpu_up/cpu_down" This reverts parts of commit f7d52eda9f27dff180a165dc3ab7000538943384. The hook android_vh_cpu_down is not used by any vendor, so remove it to help with merge issues with future LTS releases. If this is needed by any real user, it can easily be reverted to add it back and then the symbol should be added to the abi list at the same time to prevent it from being removed again later. Bug: 203756332 Bug: 176152285 Cc: Stephen Dickey Signed-off-by: Greg Kroah-Hartman Change-Id: I66e5308f32b8b11741dd4ea659cd3f79fa9a6526 --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/cpu.h | 4 ---- kernel/cgroup/cpuset.c | 1 - kernel/cpu.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 8dc3d3c10435..c88ff0ddfcf3 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -182,7 +182,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_map_util_freq); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_report_bug); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_em_cpu_energy); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpu_up); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpu_down); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_balance_rt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_timer_calc_index); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_watchdog_timer_softlockup); diff --git a/include/trace/hooks/cpu.h b/include/trace/hooks/cpu.h index 33ab6ef1f28c..8653e34064c3 100644 --- a/include/trace/hooks/cpu.h +++ b/include/trace/hooks/cpu.h @@ -14,10 +14,6 @@ DECLARE_HOOK(android_vh_cpu_up, TP_PROTO(unsigned int cpu), TP_ARGS(cpu)); -DECLARE_HOOK(android_vh_cpu_down, - TP_PROTO(void *unused), - TP_ARGS(unused)); - /* macro versions of hooks are no longer required */ #endif /* _TRACE_HOOK_CPU_H */ diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index a49b1598466d..d956748bab5d 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -3298,7 +3298,6 @@ void cpuset_wait_for_hotplug(void) { flush_work(&cpuset_hotplug_work); } -EXPORT_SYMBOL_GPL(cpuset_wait_for_hotplug); /* * Keep top_cpuset.mems_allowed tracking node_states[N_MEMORY]. diff --git a/kernel/cpu.c b/kernel/cpu.c index e3b41a8ad8e2..5a965aa03e61 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1127,8 +1127,6 @@ static int cpu_down(unsigned int cpu, enum cpuhp_state target) { int err; - trace_android_vh_cpu_down(NULL); - cpu_maps_update_begin(); err = cpu_down_maps_locked(cpu, target); cpu_maps_update_done();