KVM: selftests: Fix build of rseq test
authorMark Brown <broonie@kernel.org>
Fri, 6 Jan 2023 19:24:19 +0000 (19:24 +0000)
committerPeter Zijlstra <peterz@infradead.org>
Mon, 30 Jan 2023 15:29:45 +0000 (16:29 +0100)
commit68efe8f7a1c5168be2228bfb806ddc05475b7205
tree32e8eea146f15dc613c4d7d1c976931167350407
parent001c28e57187570e4b5aa4492c7a957fb6d65d7b
KVM: selftests: Fix build of rseq test

The KVM rseq test is failing to build in -next due to a commit merged
from the tip tree which adds a wrapper for sys_getcpu() to the rseq
kselftests, conflicting with the wrapper already included in the KVM
selftest:

rseq_test.c:48:13: error: conflicting types for 'sys_getcpu'
   48 | static void sys_getcpu(unsigned *cpu)
          |             ^~~~~~~~~~
In file included from rseq_test.c:23:
../rseq/rseq.c:82:12: note: previous definition of 'sys_getcpu' was here
   82 | static int sys_getcpu(unsigned *cpu, unsigned *node)
          |            ^~~~~~~~~~

Fix this by removing the local wrapper and moving the result check up to
the caller.

Fixes: 99babd04b250 ("selftests/rseq: Implement rseq numa node id field selftest")
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/r/20230106-fix-kvm-rseq-build-v1-1-b704d9831d02@kernel.org
tools/testing/selftests/kvm/rseq_test.c