From 496b17304af015d57562344e188d8e5809a9a648 Mon Sep 17 00:00:00 2001 From: Liujie Xie Date: Tue, 19 Oct 2021 16:17:37 +0800 Subject: [PATCH] ANDROID: vendor_hooks: Add param for android_vh_cpu_up/down Add param for android_vh_cpu_up/down. Bug: 203492840 Signed-off-by: Liujie Xie Change-Id: I1c7eaaaf980fed536883b153440eb21dbd380d08 --- include/trace/hooks/cpu.h | 8 ++++---- kernel/cpu.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/trace/hooks/cpu.h b/include/trace/hooks/cpu.h index 645702996b00..fc3eaf318b25 100644 --- a/include/trace/hooks/cpu.h +++ b/include/trace/hooks/cpu.h @@ -11,12 +11,12 @@ * mechanism for vendor modules to hook and extend functionality */ DECLARE_HOOK(android_vh_cpu_up, - TP_PROTO(void *unused), - TP_ARGS(unused)); + TP_PROTO(unsigned int cpu), + TP_ARGS(cpu)); DECLARE_HOOK(android_vh_cpu_down, - TP_PROTO(void *unused), - TP_ARGS(unused)); + TP_PROTO(unsigned int cpu), + TP_ARGS(cpu)); /* macro versions of hooks are no longer required */ diff --git a/kernel/cpu.c b/kernel/cpu.c index 7d86553a0c2e..413e2db3eb6a 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1073,7 +1073,7 @@ static int cpu_down(unsigned int cpu, enum cpuhp_state target) { int err; - trace_android_vh_cpu_down(NULL); + trace_android_vh_cpu_down(cpu); cpu_maps_update_begin(); err = cpu_down_maps_locked(cpu, target); @@ -1538,7 +1538,7 @@ static int cpu_up(unsigned int cpu, enum cpuhp_state target) return -EINVAL; } - trace_android_vh_cpu_up(NULL); + trace_android_vh_cpu_up(cpu); /* * CPU hotplug operations consists of many steps and each step