]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: pkeys: remove redundant WARN
authorJoey Gouly <joey.gouly@arm.com>
Tue, 10 Sep 2024 10:50:04 +0000 (11:50 +0100)
committerWill Deacon <will@kernel.org>
Tue, 10 Sep 2024 17:19:59 +0000 (18:19 +0100)
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 <naresh.kamboju@linaro.org>
Link: https://lore.kernel.org/linux-arm-kernel/CA+G9fYvarKEPN3u1Ogw2pcw4h6r3OMzg+5qJpYkAXRunAEF_0Q@mail.gmail.com/
Signed-off-by: Joey Gouly <joey.gouly@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20240910105004.706981-1-joey.gouly@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/pkeys.h

index 19eb1b12b7fc088e236d16b87b2c50dd19355675..0ca5f83ce148f59ba00f7eef55463c3b6dba2b45 100644 (file)
@@ -37,8 +37,6 @@ static inline int arch_override_mprotect_pkey(struct vm_area_struct *vma,
 static inline int execute_only_pkey(struct mm_struct *mm)
 {
        // Execute-only mappings are handled by EPAN/FEAT_PAN3.
-       WARN_ON_ONCE(!cpus_have_final_cap(ARM64_HAS_EPAN));
-
        return -1;
 }