Skip to content

Commit 10166c2

Browse files
jgoulywilldeacon
authored andcommitted
arm64: pkeys: remove redundant WARN
FEAT_PAN3 is present if FEAT_S1POE is, this WARN() was to represent that. However execute_only_pkey() is always called by mmap(), even on a CPU without POE support. Rather than making the WARN() conditional, just delete it. Reported-by: Naresh Kamboju <[email protected]> Link: https://lore.kernel.org/linux-arm-kernel/CA+G9fYvarKEPN3u1Ogw2pcw4h6r3OMzg+5qJpYkAXRunAEF_0Q@mail.gmail.com/ Signed-off-by: Joey Gouly <[email protected]> Cc: Will Deacon <[email protected]> Cc: Catalin Marinas <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 6a428d6 commit 10166c2

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/arm64/include/asm/pkeys.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ static inline int arch_override_mprotect_pkey(struct vm_area_struct *vma,
3737
static inline int execute_only_pkey(struct mm_struct *mm)
3838
{
3939
// Execute-only mappings are handled by EPAN/FEAT_PAN3.
40-
WARN_ON_ONCE(!cpus_have_final_cap(ARM64_HAS_EPAN));
41-
4240
return -1;
4341
}
4442

0 commit comments

Comments
 (0)