2022-01-24 19:40:44

by Mathieu Desnoyers

Subject: [RFC PATCH 11/15] selftests/rseq: Fix warnings about #if checks of undefined tokens

Signed-off-by: Mathieu Desnoyers <[email protected]>
---
tools/testing/selftests/rseq/param_test.c | 2 +-
tools/testing/selftests/rseq/rseq-x86.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/rseq/param_test.c b/tools/testing/selftests/rseq/param_test.c
index 335c290b39e7..da23c22d5882 100644
--- a/tools/testing/selftests/rseq/param_test.c
+++ b/tools/testing/selftests/rseq/param_test.c
@@ -161,7 +161,7 @@ unsigned int yield_mod_cnt, nr_abort;
" cbnz " INJECT_ASM_REG ", 222b\n" \
"333:\n"

-#elif __PPC__
+#elif defined(__PPC__)

#define RSEQ_INJECT_INPUT \
, [loop_cnt_1]"m"(loop_cnt[1]) \
diff --git a/tools/testing/selftests/rseq/rseq-x86.h b/tools/testing/selftests/rseq/rseq-x86.h
index 0ee6c041d4be..e444563c6999 100644
--- a/tools/testing/selftests/rseq/rseq-x86.h
+++ b/tools/testing/selftests/rseq/rseq-x86.h
@@ -600,7 +600,7 @@ int rseq_cmpeqv_trymemcpy_storev_release(intptr_t *v, intptr_t expect,

#endif /* !RSEQ_SKIP_FASTPATH */

-#elif __i386__
+#elif defined(__i386__)

#define rseq_smp_mb() \
__asm__ __volatile__ ("lock; addl $0,-128(%%esp)" ::: "memory", "cc")
--
2.17.1

2022-02-06 01:28:04

by tip-bot2 for Alexey Makhalov

Subject: [tip: sched/core] selftests/rseq: Fix warnings about #if checks of undefined tokens

The following commit has been merged into the sched/core branch of tip:

Commit-ID: d7ed99ade3e62b755584eea07b4e499e79240527
Gitweb: https://git.kernel.org/tip/d7ed99ade3e62b755584eea07b4e499e79240527
Author: Mathieu Desnoyers <[email protected]>
AuthorDate: Mon, 24 Jan 2022 12:12:49 -05:00
Committer: Peter Zijlstra <[email protected]>
CommitterDate: Wed, 02 Feb 2022 13:11:36 +01:00

selftests/rseq: Fix warnings about #if checks of undefined tokens

Signed-off-by: Mathieu Desnoyers <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
tools/testing/selftests/rseq/param_test.c | 2 +-
tools/testing/selftests/rseq/rseq-x86.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/rseq/param_test.c b/tools/testing/selftests/rseq/param_test.c
index 335c290..da23c22 100644
--- a/tools/testing/selftests/rseq/param_test.c
+++ b/tools/testing/selftests/rseq/param_test.c
@@ -161,7 +161,7 @@ unsigned int yield_mod_cnt, nr_abort;
" cbnz " INJECT_ASM_REG ", 222b\n" \
"333:\n"

-#elif __PPC__
+#elif defined(__PPC__)

#define RSEQ_INJECT_INPUT \
, [loop_cnt_1]"m"(loop_cnt[1]) \
diff --git a/tools/testing/selftests/rseq/rseq-x86.h b/tools/testing/selftests/rseq/rseq-x86.h
index 0ee6c04..e444563 100644
--- a/tools/testing/selftests/rseq/rseq-x86.h
+++ b/tools/testing/selftests/rseq/rseq-x86.h
@@ -600,7 +600,7 @@ int rseq_cmpeqv_trymemcpy_storev_release(intptr_t *v, intptr_t expect,

#endif /* !RSEQ_SKIP_FASTPATH */

-#elif __i386__
+#elif defined(__i386__)

#define rseq_smp_mb() \
__asm__ __volatile__ ("lock; addl $0,-128(%%esp)" ::: "memory", "cc")