]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
selftests: riscv: Fix compilation error with vstate_exec_nolibc.c
authorAlexandre Ghiti <alexghiti@rivosinc.com>
Thu, 13 Jul 2023 11:58:29 +0000 (13:58 +0200)
committerPalmer Dabbelt <palmer@rivosinc.com>
Wed, 2 Aug 2023 20:48:10 +0000 (13:48 -0700)
The following error happens:

In file included from vstate_exec_nolibc.c:2:
/usr/include/riscv64-linux-gnu/sys/prctl.h:42:12: error: conflicting types for ‘prctl’; h
ave ‘int(int, ...)’
   42 | extern int prctl (int __option, ...) __THROW;
      |            ^~~~~
In file included from ./../../../../include/nolibc/nolibc.h:99,
                 from <command-line>:
./../../../../include/nolibc/sys.h:892:5: note: previous definition of ‘prctl’ with type
‘int(int,  long unsigned int,  long unsigned int,  long unsigned int,  long unsigned int)

  892 | int prctl(int option, unsigned long arg2, unsigned long arg3,
      |     ^~~~~

Fix this by not including <sys/prctl.h>, which is not needed here since
prctl syscall is directly called using its number.

Fixes: 7cf6198ce22d ("selftests: Test RISC-V Vector prctl interface")
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20230713115829.110421-1-alexghiti@rivosinc.com
Cc: stable@vger.kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
tools/testing/selftests/riscv/vector/vstate_exec_nolibc.c

index 5cbc392944a6f926284fd9e7f15d1dbb96f9c6c8..2c0d2b1126c1e31db76fbd722bdf311bfbaafa9d 100644 (file)
@@ -1,6 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include <sys/prctl.h>
-
 #define THIS_PROGRAM "./vstate_exec_nolibc"
 
 int main(int argc, char **argv)