diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-20 10:01:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-20 10:01:37 +0100 |
| commit | 3eb93ea3272d428aab3c03e2dd272a78a7729ba8 (patch) | |
| tree | 63ca8b7e7feccb109f4b5cb868939da395c7632f /arch/arm64/kernel/efi.c | |
| parent | x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk (diff) | |
| parent | x86/mm: Remove pointless checks in vmalloc_fault (diff) | |
| download | linux-3eb93ea3272d428aab3c03e2dd272a78a7729ba8.tar.xz linux-3eb93ea3272d428aab3c03e2dd272a78a7729ba8.zip | |
Merge branch 'x86/mm' into x86/dma, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/efi.c')
| -rw-r--r-- | arch/arm64/kernel/efi.c | 2 |
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)); |