Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IC7PTE Reference: https://open.codehub.huawei.com/OpenSourceCenter/openEuler-source/kernel/fil... -------------------------------- Fix kabi change and a problem caused by kabi change. Fixes: 2aa043a55b9a ("tracing/ring-buffer: Fix wait_on_pipe() race") Signed-off-by: Liu Chuang <liuchuang40@huawei.com> --- include/linux/trace_events.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index c91bc2b8bda7..6d91ba4eb4f5 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -106,9 +106,9 @@ struct trace_iterator { unsigned int fmt_size; /* Set when the file is closed to prevent new waiters */ - bool closed; + KABI_FILL_HOLE(bool closed) - atomic_t wait_index; + KABI_REPLACE(long wait_index, atomic_t wait_index) /* trace_seq for __print_flags() and __print_symbolic() etc. */ struct trace_seq tmp_seq; -- 2.34.1