summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-03-04 08:31:24 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-03-07 13:50:19 +1100
commita5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67 (patch)
treed151dc58f5365c19cf5a7a11cd2bc9fd914e9006 /arch
parent621b5060e823301d0cba4cb52a7ee3491922d291 (diff)
downloadlinux-a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67.tar.bz2
powerpc: Align p_dyn, p_rela and p_st symbols
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> Cc: stable@vger.kernel.org Tested-by: Laurent Dufour <ldufour@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.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 1482327cfeba..d88736fbece6 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