From 0cc377d16e565b90b43b7550cdf5b3abd7942a75 Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Tue, 17 Apr 2018 13:23:10 +0200 Subject: powerpc/misc: merge reloc_offset() and add_reloc_offset() reloc_offset() is the same as add_reloc_offset(0) Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/misc.S | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'arch/powerpc/kernel/misc.S') diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S index 2f18fc1368d0..0b196cdcd15d 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 -- cgit v1.2.3