From: Jisheng Zhang <jszhang@kernel.org>
Date: Thu, 18 Nov 2021 11:24:42 +0000 (+0800)
Subject: riscv: extable: use `ex` for `exception_table_entry`
X-Git-Tag: v6.6.17~8362^2~27^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c2e7ce8b9864fa1c5f9fc5ea19af11205730cd6;p=platform%2Fkernel%2Flinux-rpi.git

riscv: extable: use `ex` for `exception_table_entry`

The var name "fixup" is a bit confusing, since this is a
exception_table_entry. Use "ex" instead  to refer to an entire entry.
In subsequent patches we'll use `fixup` to refer to the fixup
field specifically.

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---

diff --git a/arch/riscv/mm/extable.c b/arch/riscv/mm/extable.c
index d41bf38..3c561f1 100644
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
@@ -13,15 +13,15 @@
 
 bool fixup_exception(struct pt_regs *regs)
 {
-	const struct exception_table_entry *fixup;
+	const struct exception_table_entry *ex;
 
-	fixup = search_exception_tables(regs->epc);
-	if (!fixup)
+	ex = search_exception_tables(regs->epc);
+	if (!ex)
 		return false;
 
 	if (regs->epc >= BPF_JIT_REGION_START && regs->epc < BPF_JIT_REGION_END)
-		return rv_bpf_fixup_exception(fixup, regs);
+		return rv_bpf_fixup_exception(ex, regs);
 
-	regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;
+	regs->epc = (unsigned long)&ex->fixup + ex->fixup;
 	return true;
 }