mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
selftests/vm/pkeys: fix pkey_disable_clear()
Currently, pkey_disable_clear() sets the specified bits instead clearing them. This has been dead code up to now because its only callers i.e. pkey_access/write_allow() are also unused. Signed-off-by: Ram Pai <linuxram@us.ibm.com> Signed-off-by: Sandipan Das <sandipan@linux.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Dave Hansen <dave.hansen@intel.com> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Florian Weimer <fweimer@redhat.com> Cc: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Hocko <mhocko@kernel.org> Cc: Michal Suchanek <msuchanek@suse.de> Cc: Shuah Khan <shuah@kernel.org> Link: http://lkml.kernel.org/r/1f70bca60330a85dca42c3cd98212bb1cdf5a076.1585646528.git.sandipan@linux.ibm.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
0c416bcaef
commit
11551801a7
1 changed files with 2 additions and 2 deletions
|
@ -418,7 +418,7 @@ void pkey_disable_clear(int pkey, int flags)
|
|||
pkey, pkey, pkey_rights);
|
||||
pkey_assert(pkey_rights >= 0);
|
||||
|
||||
pkey_rights |= flags;
|
||||
pkey_rights &= ~flags;
|
||||
|
||||
ret = hw_pkey_set(pkey, pkey_rights, 0);
|
||||
shadow_pkey_reg = set_pkey_bits(shadow_pkey_reg, pkey, pkey_rights);
|
||||
|
@ -431,7 +431,7 @@ void pkey_disable_clear(int pkey, int flags)
|
|||
dprintf1("%s(%d) pkey_reg: 0x%016llx\n", __func__,
|
||||
pkey, read_pkey_reg());
|
||||
if (flags)
|
||||
assert(read_pkey_reg() > orig_pkey_reg);
|
||||
assert(read_pkey_reg() < orig_pkey_reg);
|
||||
}
|
||||
|
||||
void pkey_write_allow(int pkey)
|
||||
|
|
Loading…
Reference in a new issue