Merge keystone/mirror-android12-5.10 into keystone/android12-5.10-keystone-qcom-dev
* keystone/mirror-android12-5.10: ANDROID: vendor_hooks: Add param for android_vh_cpu_up/down Signed-off-by: Daniel Norman <danielnorman@google.com> Bug: 203492840 Change-Id: I8c62e0b7fd429ee6a00cb90fddda7a5c78830671
This commit is contained in:
@@ -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 */
|
||||
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user