Commit 6c0d181d authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/lib/code-patching: Make instr_is_branch_to_addr() static 



instr_is_branch_to_addr() is only used in code-patching.c

Make it static.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5f6b9c8c83170ed310953eac2f5b14539bfc964a.1621516826.git.christophe.leroy@csgroup.eu
parent 18c85964

arch/powerpc/include/asm/code-patching.h

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static inline int modify_instruction_site(s32 *site, unsigned int clr, unsigned 


int instr_is_relative_branch(struct ppc_inst instr);

int instr_is_relative_link_branch(struct ppc_inst instr);

int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr);

unsigned long branch_target(const struct ppc_inst *instr);

int translate_branch(struct ppc_inst *instr, const struct ppc_inst *dest,

		     const struct ppc_inst *src);

arch/powerpc/lib/code-patching.c

+9 −9
Original line number Diff line number Diff line
@@ -367,15 +367,6 @@ unsigned long branch_target(const struct ppc_inst *instr) 
	return 0;

}



int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr)

{

	if (instr_is_branch_iform(ppc_inst_read(instr)) ||

	    instr_is_branch_bform(ppc_inst_read(instr)))

		return branch_target(instr) == addr;



	return 0;

}



int translate_branch(struct ppc_inst *instr, const struct ppc_inst *dest,

		     const struct ppc_inst *src)

{
@@ -410,6 +401,15 @@ void __patch_exception(int exc, unsigned long addr) 


#ifdef CONFIG_CODE_PATCHING_SELFTEST



static int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr)

{

	if (instr_is_branch_iform(ppc_inst_read(instr)) ||

	    instr_is_branch_bform(ppc_inst_read(instr)))

		return branch_target(instr) == addr;



	return 0;

}



static void __init test_trampoline(void)

{

	asm ("nop;\n");