diff options
| author | Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> | 2020-07-09 06:29:38 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-07-20 15:57:59 +0300 |
| commit | 2daf298de728dc37f32d0749fa4f59db36fa7d96 (patch) | |
| tree | bfbad7864943595b4b33b6f7227ba006483aea08 /arch/powerpc/include/asm/pkeys.h | |
| parent | e10cc8715d180509a367d3ab25d40e4a1612cb2f (diff) | |
| download | linux-2daf298de728dc37f32d0749fa4f59db36fa7d96.tar.xz | |
powerpc/book3s64/pkeys: Use pkey_execute_disable_supported
Use pkey_execute_disable_supported to check for execute key support instead
of pkey_disabled.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200709032946.881753-16-aneesh.kumar@linux.ibm.com
Diffstat (limited to 'arch/powerpc/include/asm/pkeys.h')
| -rw-r--r-- | arch/powerpc/include/asm/pkeys.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/pkeys.h index dd32e30f6767..f44a14d64d47 100644 --- a/arch/powerpc/include/asm/pkeys.h +++ b/arch/powerpc/include/asm/pkeys.h @@ -126,15 +126,7 @@ static inline int mm_pkey_free(struct mm_struct *mm, int pkey) * Try to dedicate one of the protection keys to be used as an * execute-only protection key. */ -extern int __execute_only_pkey(struct mm_struct *mm); -static inline int execute_only_pkey(struct mm_struct *mm) -{ - if (static_branch_likely(&pkey_disabled)) - return -1; - - return __execute_only_pkey(mm); -} - +extern int execute_only_pkey(struct mm_struct *mm); extern int __arch_override_mprotect_pkey(struct vm_area_struct *vma, int prot, int pkey); static inline int arch_override_mprotect_pkey(struct vm_area_struct *vma, |