summaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/efi.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-03-19 16:59:34 +0100
committerTakashi Iwai <tiwai@suse.de>2018-03-19 17:00:01 +0100
commit4654eba8cbb3fcf48c6fc24fbaffa0623d9faea2 (patch)
tree0b3056c04bda1988a3705f315680224387d5a68b /arch/arm64/kernel/efi.c
parent09b9ddfaa18317f463085d602cf5f60a5fa88665 (diff)
parenta6618f4aedb2b60932d766bd82ae7ce866e842aa (diff)
Merge branch 'for-linus' into for-next
Back-merge of for-linus branch for applying the further UAC3 patches. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/arm64/kernel/efi.c')
-rw-r--r--arch/arm64/kernel/efi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index f85ac58d08a3..a8bf1c892b90 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -90,7 +90,7 @@ static int __init set_permissions(pte_t *ptep, pgtable_t token,
unsigned long addr, void *data)
{
efi_memory_desc_t *md = data;
- pte_t pte = *ptep;
+ pte_t pte = READ_ONCE(*ptep);
if (md->attribute & EFI_MEMORY_RO)
pte = set_pte_bit(pte, __pgprot(PTE_RDONLY));