| Message ID | 20180417112310.BD2686C07F@po15720vm.idsi0.si.c-s.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0cc377d16e565b90b43b7550cdf5b3abd7942a75 |
| Headers | show |
| Series | powerpc/misc: merge reloc_offset() and add_reloc_offset() | expand |
On Tue, 2018-04-17 at 11:23:10 UTC, Christophe Leroy wrote: > reloc_offset() is the same as add_reloc_offset(0) > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/0cc377d16e565b90b43b7550cdf5b3 cheers
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S index 384357cb8bc0..e1f3a5d054c4 100644 --- a/arch/powerpc/kernel/misc.S +++ b/arch/powerpc/kernel/misc.S @@ -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
reloc_offset() is the same as add_reloc_offset(0) Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/kernel/misc.S | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)