Skip to content

Commit 7a2c094

Browse files
mrutland-armwilldeacon
authored andcommitted
arm64: entry: cleanup el0 svc handler naming
For most of the exception entry code, <foo>_handler() is the first C function called from the entry assembly in entry-common.c, and external functions handling the bulk of the logic are called do_<foo>(). For consistency, apply this scheme to el0_svc_handler and el0_svc_compat_handler, renaming them to do_el0_svc and do_el0_svc_compat respectively. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <[email protected]> Reviewed-by: Anshuman Khandual <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: James Morse <[email protected]> Cc: Will Deacon <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent 2d226c1 commit 7a2c094

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

arch/arm64/include/asm/exception.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ void do_sysinstr(unsigned int esr, struct pt_regs *regs);
4545
void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);
4646
void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr);
4747
void do_cp15instr(unsigned int esr, struct pt_regs *regs);
48-
void el0_svc_handler(struct pt_regs *regs);
49-
void el0_svc_compat_handler(struct pt_regs *regs);
48+
void do_el0_svc(struct pt_regs *regs);
49+
void do_el0_svc_compat(struct pt_regs *regs);
5050
void do_el0_ia_bp_hardening(unsigned long addr, unsigned int esr,
5151
struct pt_regs *regs);
5252

arch/arm64/kernel/entry-common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ static void notrace el0_svc(struct pt_regs *regs)
215215
if (system_uses_irq_prio_masking())
216216
gic_write_pmr(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET);
217217

218-
el0_svc_handler(regs);
218+
do_el0_svc(regs);
219219
}
220220
NOKPROBE_SYMBOL(el0_svc);
221221

@@ -281,7 +281,7 @@ static void notrace el0_svc_compat(struct pt_regs *regs)
281281
if (system_uses_irq_prio_masking())
282282
gic_write_pmr(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET);
283283

284-
el0_svc_compat_handler(regs);
284+
do_el0_svc_compat(regs);
285285
}
286286
NOKPROBE_SYMBOL(el0_svc_compat);
287287

arch/arm64/kernel/syscall.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ static inline void sve_user_discard(void)
154154
sve_user_disable();
155155
}
156156

157-
void el0_svc_handler(struct pt_regs *regs)
157+
void do_el0_svc(struct pt_regs *regs)
158158
{
159159
sve_user_discard();
160160
el0_svc_common(regs, regs->regs[8], __NR_syscalls, sys_call_table);
161161
}
162162

163163
#ifdef CONFIG_COMPAT
164-
void el0_svc_compat_handler(struct pt_regs *regs)
164+
void do_el0_svc_compat(struct pt_regs *regs)
165165
{
166166
el0_svc_common(regs, regs->regs[7], __NR_compat_syscalls,
167167
compat_sys_call_table);

0 commit comments

Comments
 (0)