From b6a23be181a16e9161853b373d7bad8b2c135fbf Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Tue, 4 Oct 2022 20:52:53 +0000 Subject: [PATCH] ANDROID: Fix for kernelci !CONFIG_SMP break-breaks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ab9c52146ff6 ("ANDROID: cgroup: Add vendor hook for rebuild_root_domains_bypass") introduced a hook that declared a parameter whose name collided with a global variable. If !CONFIG_SMP, this global variable is instead a compile-time constant which causes this error: include/linux/cpu.h:101:28: error: expected ‘;’, ‘,’ or ‘)’ before numeric constant Fixes: ab9c52146ff6 ("ANDROID: cgroup: Add vendor hook for rebuild_root_domains_bypass") Signed-off-by: Todd Kjos Change-Id: I7831c5067be2ee548e8f6885eec99ab9085414fa --- include/trace/hooks/sched.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index bb84a6c428ad..4233384f6ff8 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -394,8 +394,8 @@ DECLARE_HOOK(android_vh_mmput, TP_ARGS(unused)); DECLARE_HOOK(android_vh_rebuild_root_domains_bypass, - TP_PROTO(bool cpuhp_tasks_frozen, bool *bypass), - TP_ARGS(cpuhp_tasks_frozen, bypass)); + TP_PROTO(bool tasks_frozen, bool *bypass), + TP_ARGS(tasks_frozen, bypass)); /* macro versions of hooks are no longer required */ #endif /* _TRACE_HOOK_SCHED_H */