Commit 45090c26 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: simplify patch_instruction_site() and patch_branch_site() 



Using patch_site_addr() helper, patch_instruction_site() and
patch_branch_site() can be simplified and inlined.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 584dbc77

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

+10 −2
Original line number Diff line number Diff line
@@ -33,14 +33,22 @@ unsigned int create_cond_branch(const unsigned int *addr, 
int patch_branch(unsigned int *addr, unsigned long target, int flags);

int patch_instruction(unsigned int *addr, unsigned int instr);

int raw_patch_instruction(unsigned int *addr, unsigned int instr);

int patch_instruction_site(s32 *addr, unsigned int instr);

int patch_branch_site(s32 *site, unsigned long target, int flags);



static inline unsigned long patch_site_addr(s32 *site)

{

	return (unsigned long)site + *site;

}



static inline int patch_instruction_site(s32 *site, unsigned int instr)

{

	return patch_instruction((unsigned int *)patch_site_addr(site), instr);

}



static inline int patch_branch_site(s32 *site, unsigned long target, int flags)

{

	return patch_branch((unsigned int *)patch_site_addr(site), target, flags);

}



int instr_is_relative_branch(unsigned int instr);

int instr_is_relative_link_branch(unsigned int instr);

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

arch/powerpc/lib/code-patching.c

+0 −16
Original line number Diff line number Diff line
@@ -204,22 +204,6 @@ int patch_branch(unsigned int *addr, unsigned long target, int flags) 
	return patch_instruction(addr, create_branch(addr, target, flags));

}



int patch_branch_site(s32 *site, unsigned long target, int flags)

{

	unsigned int *addr;



	addr = (unsigned int *)((unsigned long)site + *site);

	return patch_instruction(addr, create_branch(addr, target, flags));

}



int patch_instruction_site(s32 *site, unsigned int instr)

{

	unsigned int *addr;



	addr = (unsigned int *)((unsigned long)site + *site);

	return patch_instruction(addr, instr);

}



bool is_offset_in_branch_range(long offset)

{

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE