[123/127] selftests/vm/pkeys: override access right definitions on powerpc

Commit Message

Andrew Morton June 4, 2020, 11:52 p.m. UTC

From: Ram Pai <[e-mail]>
Subject: selftests/vm/pkeys: override access right definitions on powerpc

Some platforms hardcode the x86 values for PKEY_DISABLE_ACCESS
and PKEY_DISABLE_WRITE such as those in:
 /usr/include/bits/mman-shared.h.

This overrides the definitions with correct values for powerpc.

[[e-mail]: fix powerpc access right definitions]
  Link: http://lkml.kernel.org/r/[e-mail]
Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Ram Pai <[e-mail]>
Signed-off-by: Sandipan Das <[e-mail]>
Acked-by: Dave Hansen <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: Florian Weimer <[e-mail]>
Cc: "Desnes A. Nunes do Rosario" <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Thiago Jung Bauermann <[e-mail]>
Cc: "Aneesh Kumar K.V" <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Michal Suchanek <[e-mail]>
Cc: Shuah Khan <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 tools/testing/selftests/vm/pkey-powerpc.h |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Patch

--- a/tools/testing/selftests/vm/pkey-powerpc.h~selftests-vm-pkeys-override-access-right-definitions-on-powerpc
+++ a/tools/testing/selftests/vm/pkey-powerpc.h
@@ -16,13 +16,11 @@ 
 #define fpregs			fp_regs
 #define si_pkey_offset		0x20
 
-#ifndef PKEY_DISABLE_ACCESS
-# define PKEY_DISABLE_ACCESS	0x3  /* disable read and write */
-#endif
+#undef PKEY_DISABLE_ACCESS
+#define PKEY_DISABLE_ACCESS	0x3  /* disable read and write */
 
-#ifndef PKEY_DISABLE_WRITE
-# define PKEY_DISABLE_WRITE	0x2
-#endif
+#undef PKEY_DISABLE_WRITE
+#define PKEY_DISABLE_WRITE	0x2
 
 #define NR_PKEYS		32
 #define NR_RESERVED_PKEYS_4K	27 /* pkey-0, pkey-1, exec-only-pkey