From 9f58bcd6145927813fc30704e76ff46e992779e5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Oct 2021 17:31:20 +0200 Subject: [PATCH] Revert half of "ANDROID: vendor_hooks: Add param for android_vh_cpu_up/down" This reverts half of commit 496b17304af015d57562344e188d8e5809a9a648. This hook is not used, so the param is not needed at all. Step on the way to remove the hook entirely. Bug: 203756332 Bug: 203492840 Cc: Liujie Xie Signed-off-by: Greg Kroah-Hartman Change-Id: I84c021f1139e0bbadc3573211a8ee8a24273f5e9 --- include/trace/hooks/cpu.h | 4 ++-- kernel/cpu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/trace/hooks/cpu.h b/include/trace/hooks/cpu.h index fc3eaf318b25..33ab6ef1f28c 100644 --- a/include/trace/hooks/cpu.h +++ b/include/trace/hooks/cpu.h @@ -15,8 +15,8 @@ DECLARE_HOOK(android_vh_cpu_up, TP_ARGS(cpu)); DECLARE_HOOK(android_vh_cpu_down, - TP_PROTO(unsigned int cpu), - TP_ARGS(cpu)); + TP_PROTO(void *unused), + TP_ARGS(unused)); /* macro versions of hooks are no longer required */ diff --git a/kernel/cpu.c b/kernel/cpu.c index 739597d16bf6..e3b41a8ad8e2 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1127,7 +1127,7 @@ static int cpu_down(unsigned int cpu, enum cpuhp_state target) { int err; - trace_android_vh_cpu_down(cpu); + trace_android_vh_cpu_down(NULL); cpu_maps_update_begin(); err = cpu_down_maps_locked(cpu, target);