The patch titled
Subject: selftests: vm: pkeys: fix powerpc access right definitions
has been removed from the -mm tree. Its filename was
selftests-vm-pkeys-override-access-right-definitions-on-powerpc-fix.patch
This patch was dropped because it was folded into selftests-vm-pkeys-override-access-right-definitions-on-powerpc.patch
------------------------------------------------------
From: Sandipan Das <sandipan@xxxxxxxxxxxxx>
Subject: selftests: vm: pkeys: fix powerpc access right definitions
For powerpc, PKEY_DISABLE_WRITE and PKEY_DISABLE_ACCESS are redefined only
if the system headers already define them. Otherwise, the test fails to
compile due to their absence. This makes sure that they are always
defined irrespective of them being present in the system headers.
Link: http://lkml.kernel.org/r/1ba86fd8a94f38131cfe2d9f277001dd1ad1d34e.1588959697.git.sandipan@xxxxxxxxxxxxx
Fixes: 130f573c2a79 ("selftests/vm/pkeys: introduce powerpc support")
Signed-off-by: Sandipan Das <sandipan@xxxxxxxxxxxxx>
Reported-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: "Desnes A. Nunes do Rosario" <desnesn@xxxxxxxxxxxxxxxxxx>
Cc: Florian Weimer <fweimer@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Michal Suchanek <msuchanek@xxxxxxx>
Cc: Ram Pai <linuxram@xxxxxxxxxx>
Cc: Shuah Khan <shuah@xxxxxxxxxx>
Cc: Thiago Jung Bauermann <bauerman@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/vm/pkey-powerpc.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
--- a/tools/testing/selftests/vm/pkey-powerpc.h~selftests-vm-pkeys-override-access-right-definitions-on-powerpc-fix
+++ a/tools/testing/selftests/vm/pkey-powerpc.h
@@ -16,15 +16,11 @@
#define fpregs fp_regs
#define si_pkey_offset 0x20
-#ifdef PKEY_DISABLE_ACCESS
#undef PKEY_DISABLE_ACCESS
-# define PKEY_DISABLE_ACCESS 0x3 /* disable read and write */
-#endif
+#define PKEY_DISABLE_ACCESS 0x3 /* disable read and write */
-#ifdef PKEY_DISABLE_WRITE
#undef PKEY_DISABLE_WRITE
-# define PKEY_DISABLE_WRITE 0x2
-#endif
+#define PKEY_DISABLE_WRITE 0x2
#define NR_PKEYS 32
#define NR_RESERVED_PKEYS_4K 27 /* pkey-0, pkey-1, exec-only-pkey
_
Patches currently in -mm which might be from sandipan@xxxxxxxxxxxxx are
selftests-vm-pkeys-use-sane-types-for-pkey-register.patch
selftests-vm-pkeys-add-helpers-for-pkey-bits.patch
selftests-vm-pkeys-use-the-correct-huge-page-size.patch
selftests-vm-pkeys-override-access-right-definitions-on-powerpc.patch
selftests-vm-pkeys-use-the-correct-page-size-on-powerpc.patch
selftests-vm-pkeys-fix-multilib-builds-for-x86.patch
