From 5d0e79051425a6607959e2ab918ef3068cce07f0 Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Tue, 19 Oct 2021 17:02:15 +0100 Subject: arm64: extable: use `ex` for `exception_table_entry` Subsequent patches will extend `struct exception_table_entry` with more fields, and the distinction between the entry and its `fixup` field will become more important. For clarity, let's consistently use `ex` to refer to refer to an entire entry. In subsequent patches we'll use `fixup` to refer to the fixup field specifically. This matches the naming convention used today in arch/arm64/net/bpf_jit_comp.c. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland Acked-by: Robin Murphy Reviewed-by: Ard Biesheuvel Cc: Catalin Marinas Cc: James Morse Cc: Will Deacon Link: https://lore.kernel.org/r/20211019160219.5202-10-mark.rutland@arm.com Signed-off-by: Will Deacon --- arch/arm64/mm/extable.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/mm/extable.c b/arch/arm64/mm/extable.c index 3ebc738870f5..dba3d59f3eca 100644 --- a/arch/arm64/mm/extable.c +++ b/arch/arm64/mm/extable.c @@ -8,15 +8,15 @@ bool fixup_exception(struct pt_regs *regs) { - const struct exception_table_entry *fixup; + const struct exception_table_entry *ex; - fixup = search_exception_tables(instruction_pointer(regs)); - if (!fixup) + ex = search_exception_tables(instruction_pointer(regs)); + if (!ex) return false; if (in_bpf_jit(regs)) - return arm64_bpf_fixup_exception(fixup, regs); + return arm64_bpf_fixup_exception(ex, regs); - regs->pc = (unsigned long)&fixup->fixup + fixup->fixup; + regs->pc = (unsigned long)&ex->fixup + ex->fixup; return true; } -- cgit v1.2.3