From 3214222f0757e108dd1a7edaa60b376b61a87a91 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 19 Aug 2022 10:37:58 -0400 Subject: [PATCH] Fix: incorrect stub prototypes when CONFIG_HAVE_SYSCALL_TRACEPOINTS=n The stub prototypes do not match the expected argument types, and extra erroneous semicolons are present. This has been fixed by a refactoring in the master branch: commit f2db8be348380b48e3795d14e49cc585b3c357fd Author: Mathieu Desnoyers Date: Mon Nov 1 15:14:44 2021 -0400 Cleanup: syscall filter enable/disable event Fixes: #1357 Signed-off-by: Mathieu Desnoyers Change-Id: I43130c8ebb7fbc6961a3b73a7b04845bef59d318 --- include/lttng/events-internal.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index ca2190c4..e31e6abb 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -848,25 +848,34 @@ static inline int lttng_syscalls_destroy(struct lttng_kernel_channel_buffer *cha } static inline int lttng_syscall_filter_enable_event(struct lttng_kernel_channel_buffer *chan, - struct lttng_kernel_event_recorder *event); + struct lttng_kernel_event_recorder *event) { return -ENOSYS; } static inline int lttng_syscall_filter_disable_event(struct lttng_kernel_channel_buffer *chan, - struct lttng_kernel_event_recorder *event); + struct lttng_kernel_event_recorder *event) +{ + return -ENOSYS; +} + +static inline int lttng_syscalls_destroy_event(struct lttng_kernel_channel_buffer *chan) +{ + return 0; +} + +static inline int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_notifier_enabler *event_notifier_enabler) { return -ENOSYS; } static inline long lttng_channel_syscall_mask(struct lttng_kernel_channel_buffer *channel, - struct lttng_kernel_syscall_mask __user *usyscall_mask) + struct lttng_kernel_abi_syscall_mask __user *usyscall_mask) { return -ENOSYS; } -static inline int lttng_syscalls_register_event_notifier( - struct lttng_event_notifier_group *group) +static inline int lttng_syscalls_register_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler) { return -ENOSYS; } @@ -877,16 +886,12 @@ static inline int lttng_syscalls_unregister_event_notifier_group( return 0; } -static inline int lttng_syscall_filter_enable_event_notifier( - struct lttng_event_notifier_group *group, - const char *name) +static inline int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifier *event_notifier) { return -ENOSYS; } -static inline int lttng_syscall_filter_disable_event_notifier( - struct lttng_event_notifier_group *group, - const char *name) +static inline int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier) { return -ENOSYS; } -- 2.34.1