diff options
| author | Christophe Leroy | 2018-04-17 13:23:10 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2018-06-03 16:39:17 +0200 |
| commit | 0cc377d16e565b90b43b7550cdf5b3abd7942a75 (patch) | |
| tree | dbbcf2884f09180dc3acf6d7439163cb04905035 /arch/powerpc/kernel/misc.S | |
| parent | powerpc/64: optimises from64to32() (diff) | |
| download | kernel-qcow2-linux-0cc377d16e565b90b43b7550cdf5b3abd7942a75.tar.gz kernel-qcow2-linux-0cc377d16e565b90b43b7550cdf5b3abd7942a75.tar.xz kernel-qcow2-linux-0cc377d16e565b90b43b7550cdf5b3abd7942a75.zip | |
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/powerpc/kernel/misc.S')
| -rw-r--r-- | arch/powerpc/kernel/misc.S | 17 |
1 files changed, 3 insertions, 14 deletions
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 |