From: Ruiqiang Hao Date: Tue, 26 May 2020 03:36:17 +0000 (+0000) Subject: Fix: syscalls: Ignore fcntl cmd specific to 32-bit in 64-bit only config X-Git-Tag: v2.13.0-rc1~210 X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=f25545b11fd0f467ca6271817885d82a431e906e Fix: syscalls: Ignore fcntl cmd specific to 32-bit in 64-bit only config When CONFIG_64BIT is defined and CONFIG_COMPAT is not defined, the fcntl system call "F_GETLK64", "F_SETLK64" and "F_SETLKW64" should be ignored. Signed-off-by: Ruiqiang Hao Signed-off-by: Mathieu Desnoyers --- diff --git a/include/instrumentation/syscalls/headers/syscalls_integers_override.h b/include/instrumentation/syscalls/headers/syscalls_integers_override.h index da548b1b..e5578640 100644 --- a/include/instrumentation/syscalls/headers/syscalls_integers_override.h +++ b/include/instrumentation/syscalls/headers/syscalls_integers_override.h @@ -38,9 +38,11 @@ SC_LTTNG_TRACEPOINT_ENUM(lttng_fcntl_cmd_flags, ctf_enum_value("F_GETOWN", F_GETOWN) ctf_enum_value("F_SETSIG", F_SETSIG) ctf_enum_value("F_GETSIG", F_GETSIG) +#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT) ctf_enum_value("F_GETLK64", F_GETLK64) ctf_enum_value("F_SETLK64", F_SETLK64) ctf_enum_value("F_SETLKW64", F_SETLKW64) +#endif /* #if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT) */ ctf_enum_value("F_SETOWN_EX", F_SETOWN_EX) ctf_enum_value("F_GETOWN_EX", F_GETOWN_EX) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))