Commit b80affe3 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'linux-kselftest-fixes-5.11-rc1' of...

Merge tag 'linux-kselftest-fixes-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest fixes from Shuah Khan:
 "Build fixes for clone3 and rseq tests"

* tag 'linux-kselftest-fixes-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/clone3: Fix build error
  rseq/selftests: Fix MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ build error under other arch.
parents 7a932e57 88f4ede4
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
CFLAGS += -g -I../../../../usr/include/ CFLAGS += -g -std=gnu99 -I../../../../usr/include/
LDLIBS += -lcap LDLIBS += -lcap
TEST_GEN_PROGS := clone3 clone3_clear_sighand clone3_set_tid \ TEST_GEN_PROGS := clone3 clone3_clear_sighand clone3_set_tid \
......
...@@ -1133,6 +1133,8 @@ static int set_signal_handler(void) ...@@ -1133,6 +1133,8 @@ static int set_signal_handler(void)
return ret; return ret;
} }
/* Test MEMBARRIER_CMD_PRIVATE_RESTART_RSEQ_ON_CPU membarrier command. */
#ifdef RSEQ_ARCH_HAS_OFFSET_DEREF_ADDV
struct test_membarrier_thread_args { struct test_membarrier_thread_args {
int stop; int stop;
intptr_t percpu_list_ptr; intptr_t percpu_list_ptr;
...@@ -1286,8 +1288,6 @@ void *test_membarrier_manager_thread(void *arg) ...@@ -1286,8 +1288,6 @@ void *test_membarrier_manager_thread(void *arg)
return NULL; return NULL;
} }
/* Test MEMBARRIER_CMD_PRIVATE_RESTART_RSEQ_ON_CPU membarrier command. */
#ifdef RSEQ_ARCH_HAS_OFFSET_DEREF_ADDV
void test_membarrier(void) void test_membarrier(void)
{ {
const int num_threads = opt_threads; const int num_threads = opt_threads;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment