Commit 0cc377d1 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/misc: merge reloc_offset() and add_reloc_offset() 



reloc_offset() is the same as add_reloc_offset(0)

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

arch/powerpc/kernel/misc.S

+3 −14
Original line number Diff line number Diff line
@@ -25,23 +25,12 @@ 
/*

 * Returns (address we are running at) - (address we were linked at)

 * for use before the text and data are mapped to KERNELBASE.

 */



_GLOBAL(reloc_offset)

	mflr	r0

	bl	1f

1:	mflr	r3

	PPC_LL	r4,(2f-1b)(r3)

	subf	r3,r4,r3

	mtlr	r0

	blr



	.align	3

2:	PPC_LONG 1b



/*

 * add_reloc_offset(x) returns x + reloc_offset().

 */



_GLOBAL(reloc_offset)

	li	r3, 0

_GLOBAL(add_reloc_offset)

	mflr	r0

	bl	1f