summaryrefslogtreecommitdiffstats
path: root/arch/arm64/mm
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2021-10-19 17:02:15 +0100
committerWill Deacon <will@kernel.org>2021-10-21 10:45:22 +0100
commit5d0e79051425a6607959e2ab918ef3068cce07f0 (patch)
treeef831fe2087c405d28fc83fe3c55e760fe87d932 /arch/arm64/mm
parente8c328d7de03bf4d7a18e38ff87a7c12fdf8afb1 (diff)
downloadlinux-5d0e79051425a6607959e2ab918ef3068cce07f0.tar.bz2
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 <mark.rutland@arm.com> Acked-by: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: James Morse <james.morse@arm.com> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20211019160219.5202-10-mark.rutland@arm.com Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r--arch/arm64/mm/extable.c10
1 files 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;
}