summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2018-04-17 13:23:10 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2018-06-04 00:39:17 +1000
commit0cc377d16e565b90b43b7550cdf5b3abd7942a75 (patch)
treedbbcf2884f09180dc3acf6d7439163cb04905035 /arch
parent55a0edf083022e402042255a0afb03d0b3a63a9b (diff)
downloadlinux-0-day-0cc377d16e565b90b43b7550cdf5b3abd7942a75.tar.gz
linux-0-day-0cc377d16e565b90b43b7550cdf5b3abd7942a75.tar.xz
powerpc/misc: merge reloc_offset() and add_reloc_offset()
reloc_offset() is the same as add_reloc_offset(0) Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/misc.S17
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index 2f18fc1368d0a..0b196cdcd15d4 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