Commit 37143dcc authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: constify sys64_hook instances 



All instances of struct sys64_hook contain compile-time constant data,
and are never inentionally modified, so let's make them all const.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 0da23df2

arch/arm64/kernel/traps.c

+5 −5
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ struct sys64_hook { 
	void (*handler)(unsigned int esr, struct pt_regs *regs);

};



static struct sys64_hook sys64_hooks[] = {

static const struct sys64_hook sys64_hooks[] = {

	{

		.esr_mask = ESR_ELx_SYS64_ISS_EL0_CACHE_OP_MASK,

		.esr_val = ESR_ELx_SYS64_ISS_EL0_CACHE_OP_VAL,
@@ -636,7 +636,7 @@ static void compat_cntfrq_read_handler(unsigned int esr, struct pt_regs *regs) 
	arm64_compat_skip_faulting_instruction(regs, 4);

}



static struct sys64_hook cp15_32_hooks[] = {

static const struct sys64_hook cp15_32_hooks[] = {

	{

		.esr_mask = ESR_ELx_CP15_32_ISS_SYS_MASK,

		.esr_val = ESR_ELx_CP15_32_ISS_SYS_CNTFRQ,
@@ -656,7 +656,7 @@ static void compat_cntvct_read_handler(unsigned int esr, struct pt_regs *regs) 
	arm64_compat_skip_faulting_instruction(regs, 4);

}



static struct sys64_hook cp15_64_hooks[] = {

static const struct sys64_hook cp15_64_hooks[] = {

	{

		.esr_mask = ESR_ELx_CP15_64_ISS_SYS_MASK,

		.esr_val = ESR_ELx_CP15_64_ISS_SYS_CNTVCT,
@@ -667,7 +667,7 @@ static struct sys64_hook cp15_64_hooks[] = { 


asmlinkage void __exception do_cp15instr(unsigned int esr, struct pt_regs *regs)

{

	struct sys64_hook *hook, *hook_base;

	const struct sys64_hook *hook, *hook_base;



	if (!cp15_cond_valid(esr, regs)) {

		/*
@@ -707,7 +707,7 @@ asmlinkage void __exception do_cp15instr(unsigned int esr, struct pt_regs *regs) 


asmlinkage void __exception do_sysinstr(unsigned int esr, struct pt_regs *regs)

{

	struct sys64_hook *hook;

	const struct sys64_hook *hook;



	for (hook = sys64_hooks; hook->handler; hook++)

		if ((hook->esr_mask & esr) == hook->esr_val) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE