summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-03-03 21:31:24 (GMT)
committerJiri Slaby <jslaby@suse.cz>2014-03-22 21:01:53 (GMT)
commit49799bba6fc2d0c3a32bf4c5c30b4d74ea689628 (patch)
treec900e069814f2609f59ed18121f35f20b98070cc /arch
parent2725f34b41f8e3f444688a814cc2763a1c2b138b (diff)
downloadlinux-fsl-qoriq-49799bba6fc2d0c3a32bf4c5c30b4d74ea689628.tar.xz
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: Jiri Slaby <jslaby@suse.cz>
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 b47a0e1..c712ece 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