[PATCH] perf/benchmark: fix seccom_unotify benchmark for 32-bit

Jiri Slaby (SUSE) posted 1 patch 2 years, 2 months ago
There is a newer version of this series
tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] perf/benchmark: fix seccom_unotify benchmark for 32-bit
Posted by Jiri Slaby (SUSE) 2 years, 2 months ago
From: Andrei Vagin <avagin@google.com>

Commit 7d5cb68af638 (perf/benchmark: add a new benchmark for
seccom_unotify) added a reference to __NR_seccomp into perf. This is
fine as it added also a definition of __NR_seccomp for 64-bit. But it
failed to do so for 32-bit as instead of ifndef, ifdef was used.

Fix this typo (so fix the build of perf on 32-bit).

Fixes: 7d5cb68af638 (perf/benchmark: add a new benchmark for seccom_unotify)
Cc: Andrei Vagin <avagin@google.com>
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
 tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/arch/x86/include/uapi/asm/unistd_32.h b/tools/arch/x86/include/uapi/asm/unistd_32.h
index 4798f9d18fe8..9de35df1afc3 100644
--- a/tools/arch/x86/include/uapi/asm/unistd_32.h
+++ b/tools/arch/x86/include/uapi/asm/unistd_32.h
@@ -26,6 +26,6 @@
 #ifndef __NR_setns
 #define __NR_setns 346
 #endif
-#ifdef __NR_seccomp
+#ifndef __NR_seccomp
 #define __NR_seccomp 354
 #endif
-- 
2.42.0
Re: [PATCH] perf/benchmark: fix seccom_unotify benchmark for 32-bit
Posted by Jiri Slaby 2 years, 2 months ago
Ignore this one, I mangled authorship.

On 17. 10. 23, 10:29, Jiri Slaby (SUSE) wrote:
> From: Andrei Vagin <avagin@google.com>
> 
> Commit 7d5cb68af638 (perf/benchmark: add a new benchmark for
> seccom_unotify) added a reference to __NR_seccomp into perf. This is
> fine as it added also a definition of __NR_seccomp for 64-bit. But it
> failed to do so for 32-bit as instead of ifndef, ifdef was used.
> 
> Fix this typo (so fix the build of perf on 32-bit).
> 
> Fixes: 7d5cb68af638 (perf/benchmark: add a new benchmark for seccom_unotify)
> Cc: Andrei Vagin <avagin@google.com>
> Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
> Cc: Kees Cook <keescook@chromium.org>
> Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
> ---
>   tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/arch/x86/include/uapi/asm/unistd_32.h b/tools/arch/x86/include/uapi/asm/unistd_32.h
> index 4798f9d18fe8..9de35df1afc3 100644
> --- a/tools/arch/x86/include/uapi/asm/unistd_32.h
> +++ b/tools/arch/x86/include/uapi/asm/unistd_32.h
> @@ -26,6 +26,6 @@
>   #ifndef __NR_setns
>   #define __NR_setns 346
>   #endif
> -#ifdef __NR_seccomp
> +#ifndef __NR_seccomp
>   #define __NR_seccomp 354
>   #endif

-- 
js
suse labs