summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-01-06 20:24:19 +0100
committerPeter Zijlstra <peterz@infradead.org>2023-01-30 16:29:45 +0100
commit68efe8f7a1c5168be2228bfb806ddc05475b7205 (patch)
tree32e8eea146f15dc613c4d7d1c976931167350407 /fs/btrfs/disk-io.c
parentexit: Detect and fix irq disabled state in oops (diff)
downloadlinux-68efe8f7a1c5168be2228bfb806ddc05475b7205.tar.xz
linux-68efe8f7a1c5168be2228bfb806ddc05475b7205.zip
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
Diffstat (limited to 'fs/btrfs/disk-io.c')
0 files changed, 0 insertions, 0 deletions