diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2017-11-02 15:53:54 +0000 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2017-11-02 15:54:58 +0000 |
commit | 05f3647359f8bf44e000122cee6a848f5129e2e3 (patch) | |
tree | 072631bead382da3152ffa5b7c5767f683ddca16 /arch/arm64/include | |
parent | 7bdeb7f52b1b193bb50fc6d01c6110ba50bafb5b (diff) | |
parent | 9e66317d3c92ddaab330c125dfe9d06eee268aff (diff) |
Merge tag 'v4.14-rc3' into irq/irqchip-4.15
Required merge to get mainline irqchip updates.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm64/include')
-rw-r--r-- | arch/arm64/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index bc4e92337d16..b46e54c2399b 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -401,7 +401,7 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd) /* Find an entry in the third-level page table. */ #define pte_index(addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_phys(dir,addr) (pmd_page_paddr(*(dir)) + pte_index(addr) * sizeof(pte_t)) +#define pte_offset_phys(dir,addr) (pmd_page_paddr(READ_ONCE(*(dir))) + pte_index(addr) * sizeof(pte_t)) #define pte_offset_kernel(dir,addr) ((pte_t *)__va(pte_offset_phys((dir), (addr)))) #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) |