On some distros, there are conflicts w.r.t to redefinition of pkey syscall numbers which cause build failures. This fixes them.
Reported-by: Sachin Sant <sach...@linux.vnet.ibm.com> Signed-off-by: Sandipan Das <sandi...@linux.ibm.com> --- Previous versions can be found at: v2: https://lore.kernel.org/linuxppc-dev/566dde119ce71f00f9642807ba30ceb7f54c9bfa.1596441105.git.sandi...@linux.ibm.com/ v1: https://lore.kernel.org/linuxppc-dev/20200803074043.466809-1-sandi...@linux.ibm.com/ Changes in v3: - Use ifndef...endif instead of undef as suggested by Michael. Changes in v2: - Fix incorrect commit message. --- tools/testing/selftests/powerpc/include/pkeys.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/powerpc/include/pkeys.h b/tools/testing/selftests/powerpc/include/pkeys.h index 6ba95039a034..54bf9aa9e1e1 100644 --- a/tools/testing/selftests/powerpc/include/pkeys.h +++ b/tools/testing/selftests/powerpc/include/pkeys.h @@ -31,9 +31,17 @@ #define SI_PKEY_OFFSET 0x20 +#ifndef SYS_pkey_mprotect #define SYS_pkey_mprotect 386 +#endif + +#ifndef SYS_pkey_alloc #define SYS_pkey_alloc 384 +#endif + +#ifndef SYS_pkey_free #define SYS_pkey_free 385 +#endif #define PKEY_BITS_PER_PKEY 2 #define NR_PKEYS 32 -- 2.25.1
