aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-03-04 08:31:24 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-23 21:38:14 -0700
commit27fdae48c06e3d82abe9bce30447512a57a533f8 (patch)
tree63f455cadeda717b0172d07e911a555b2ff75fa7 /arch
parent6f06330c7a0464591a4d43532654dbaf5dd509d1 (diff)
downloadlinaro-lsk-27fdae48c06e3d82abe9bce30447512a57a533f8.tar.gz
powerpc: Align p_dyn, p_rela and p_st symbols
commit a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67 upstream. The 64bit relocation code places a few symbols in the text segment. These symbols are only 4 byte aligned where they need to be 8 byte aligned. Add an explicit alignment. Signed-off-by: Anton Blanchard <anton@samba.org> Tested-by: Laurent Dufour <ldufour@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/reloc_64.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/reloc_64.S b/arch/powerpc/kernel/reloc_64.S
index b47a0e1ab00..c712ecec13b 100644
--- a/arch/powerpc/kernel/reloc_64.S
+++ b/arch/powerpc/kernel/reloc_64.S
@@ -81,6 +81,7 @@ _GLOBAL(relocate)
6: blr
+.balign 8
p_dyn: .llong __dynamic_start - 0b
p_rela: .llong __rela_dyn_start - 0b
p_st: .llong _stext - 0b