From: Anshuman Khandual <anshuman.khandual@arm.com>
Date: Sat, 22 Sep 2018 15:39:52 +0000 (+0530)
Subject: arm64/mm: Use ESR_ELx_FSC macro while decoding fault exception
X-Git-Tag: 4.20-smb3-fixes~85^2~24
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=00bbd5d9016d49fa8dddef020a06b94fedca9148;p=sfrench%2Fcifs-2.6.git

arm64/mm: Use ESR_ELx_FSC macro while decoding fault exception

Just replace hard code value of 63 (0x111111) with an existing macro
ESR_ELx_FSC when parsing for the status code during fault exception.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 6342f1793c70..6d9acd910104 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -59,7 +59,7 @@ static const struct fault_info fault_info[];
 
 static inline const struct fault_info *esr_to_fault_info(unsigned int esr)
 {
-	return fault_info + (esr & 63);
+	return fault_info + (esr & ESR_ELx_FSC);
 }
 
 #ifdef CONFIG_KPROBES