Skip to content

Commit 5d0e790

Browse files
mrutland-armwilldeacon
authored andcommitted
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 <[email protected]> Acked-by: Robin Murphy <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: James Morse <[email protected]> Cc: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent e8c328d commit 5d0e790

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/arm64/mm/extable.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
bool fixup_exception(struct pt_regs *regs)
1010
{
11-
const struct exception_table_entry *fixup;
11+
const struct exception_table_entry *ex;
1212

13-
fixup = search_exception_tables(instruction_pointer(regs));
14-
if (!fixup)
13+
ex = search_exception_tables(instruction_pointer(regs));
14+
if (!ex)
1515
return false;
1616

1717
if (in_bpf_jit(regs))
18-
return arm64_bpf_fixup_exception(fixup, regs);
18+
return arm64_bpf_fixup_exception(ex, regs);
1919

20-
regs->pc = (unsigned long)&fixup->fixup + fixup->fixup;
20+
regs->pc = (unsigned long)&ex->fixup + ex->fixup;
2121
return true;
2222
}

0 commit comments

Comments
 (0)