summaryrefslogtreecommitdiff
path: root/drivers/firmware/efi/memattr.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2021-05-23 11:39:02 +0200
committerIngo Molnar <mingo@kernel.org>2021-05-23 11:39:02 +0200
commite169fba4f464760dd9734c9e39e1c2e88e374f32 (patch)
treed912813c8a5158e6817ad04de7a0a1950551f521 /drivers/firmware/efi/memattr.c
parent4ff2473bdb4cf2bb7d208ccf4418d3d7e6b1652c (diff)
parent942859d969de7f6f7f2659a79237a758b42782da (diff)
downloadlinux-e169fba4f464760dd9734c9e39e1c2e88e374f32.tar.gz
linux-e169fba4f464760dd9734c9e39e1c2e88e374f32.tar.bz2
linux-e169fba4f464760dd9734c9e39e1c2e88e374f32.zip
Merge tag 'efi-urgent-for-v5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull EFI fixes for v5.13-rc from Ard Biesheuvel: "A handful of low urgency EFI fixes accumulated over the past couple of months." Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/memattr.c')
-rw-r--r--drivers/firmware/efi/memattr.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/firmware/efi/memattr.c b/drivers/firmware/efi/memattr.c
index 5737cb0fcd44..0a9aba5f9cef 100644
--- a/drivers/firmware/efi/memattr.c
+++ b/drivers/firmware/efi/memattr.c
@@ -67,11 +67,6 @@ static bool entry_is_valid(const efi_memory_desc_t *in, efi_memory_desc_t *out)
return false;
}
- if (!(in->attribute & (EFI_MEMORY_RO | EFI_MEMORY_XP))) {
- pr_warn("Entry attributes invalid: RO and XP bits both cleared\n");
- return false;
- }
-
if (PAGE_SIZE > EFI_PAGE_SIZE &&
(!PAGE_ALIGNED(in->phys_addr) ||
!PAGE_ALIGNED(in->num_pages << EFI_PAGE_SHIFT))) {