From: Will Deacon <will.deacon@arm.com>
Date: Tue, 28 Jul 2015 15:14:03 +0000 (+0100)
Subject: arm64: pgtable: fix definition of pte_valid
X-Git-Tag: Ubuntu-5.10.0-12.13~14162^2~22
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=766ffb69803943c2b580a44ac14a189b875d21f6;p=mirror_ubuntu-hirsute-kernel.git

arm64: pgtable: fix definition of pte_valid

pte_valid should check if the PTE_VALID bit (1 << 0) is set in the pte,
so fix the macro definition to use bitwise & instead of logical &&.

Signed-off-by: Will Deacon <will.deacon@arm.com>
---

diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index d001846c13ac..6900b2d95371 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -153,7 +153,7 @@ extern struct page *empty_zero_page;
 #define pte_sw_dirty(pte)	(!!(pte_val(pte) & PTE_DIRTY))
 #define pte_dirty(pte)		(pte_sw_dirty(pte) || pte_hw_dirty(pte))
 
-#define pte_valid(pte)		(!!(pte_val(pte) && PTE_VALID))
+#define pte_valid(pte)		(!!(pte_val(pte) & PTE_VALID))
 #define pte_valid_user(pte) \
 	((pte_val(pte) & (PTE_VALID | PTE_USER)) == (PTE_VALID | PTE_USER))
 #define pte_valid_not_user(pte) \