Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux-2.6-block.git] / arch / arm64 / include / asm / memory.h

diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index b01ef0180a03cd2f18e27e369082330f03326734..290195168bb3c7f3aa90820e49c2364e62ce04d2 100644 (file)
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -312,8 +312,9 @@ static inline void *phys_to_virt(phys_addr_t x)
 #define page_to_virt(page)     ({                                      \
        unsigned long __addr =                                          \
                ((__page_to_voff(page)) | PAGE_OFFSET);                 \
-       __addr = __tag_set(__addr, page_kasan_tag(page));               \
-       ((void *)__addr);                                               \
+       unsigned long __addr_tag =                                      \
+                __tag_set(__addr, page_kasan_tag(page));               \
+       ((void *)__addr_tag);                                           \
 })
 
 #define virt_to_page(vaddr)    ((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))