[GIT PULL] Kselftest fixes update for Linux 5.11-rc1

[Shuah Khan <skhan@linuxfoundation.org>]

[-- Attachment #1: Type: text/plain, Size: 1338 bytes --]

Hi Linus,

Please pull this Kselftest fixes update for Linux 5.11-rc1.

This Kselftest fixes update for Linux 5.11-rc1 consists of build error
fixes for clone3 and rseq tests.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit 0477e92881850d44910a7e94fc2c46f96faa131f:

   Linux 5.10-rc7 (2020-12-06 14:25:12 -0800)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest 
tags/linux-kselftest-fixes-5.11-rc1

for you to fetch changes up to 88f4ede44c585b24674dd99841040b2a1a856a76:

   selftests/clone3: Fix build error (2020-12-07 14:34:55 -0700)

----------------------------------------------------------------
linux-kselftest-fixes-5.11-rc1

This Kselftest fixes update for Linux 5.11-rc1 consists of build error
fixes for clone3 and rseq tests.

----------------------------------------------------------------
Xingxing Su (2):
       rseq/selftests: Fix MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ build 
error under other arch.
       selftests/clone3: Fix build error

  tools/testing/selftests/clone3/Makefile   | 2 +-
  tools/testing/selftests/rseq/param_test.c | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------



[-- Attachment #2: linux-kselftest-fixes-5.11-rc1.diff --]
[-- Type: text/x-patch, Size: 1235 bytes --]

diff --git a/tools/testing/selftests/clone3/Makefile b/tools/testing/selftests/clone3/Makefile
index ef7564cb7abe..79b19a2863a0 100644
--- a/tools/testing/selftests/clone3/Makefile
+++ b/tools/testing/selftests/clone3/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-CFLAGS += -g -I../../../../usr/include/
+CFLAGS += -g -std=gnu99 -I../../../../usr/include/
 LDLIBS += -lcap
 
 TEST_GEN_PROGS := clone3 clone3_clear_sighand clone3_set_tid \
diff --git a/tools/testing/selftests/rseq/param_test.c b/tools/testing/selftests/rseq/param_test.c
index 384589095864..699ad5f93c34 100644
--- a/tools/testing/selftests/rseq/param_test.c
+++ b/tools/testing/selftests/rseq/param_test.c
@@ -1133,6 +1133,8 @@ static int set_signal_handler(void)
 	return ret;
 }
 
+/* Test MEMBARRIER_CMD_PRIVATE_RESTART_RSEQ_ON_CPU membarrier command. */
+#ifdef RSEQ_ARCH_HAS_OFFSET_DEREF_ADDV
 struct test_membarrier_thread_args {
 	int stop;
 	intptr_t percpu_list_ptr;
@@ -1286,8 +1288,6 @@ void *test_membarrier_manager_thread(void *arg)
 	return NULL;
 }
 
-/* Test MEMBARRIER_CMD_PRIVATE_RESTART_RSEQ_ON_CPU membarrier command. */
-#ifdef RSEQ_ARCH_HAS_OFFSET_DEREF_ADDV
 void test_membarrier(void)
 {
 	const int num_threads = opt_threads;