From: Anton Blanchard <anton@samba.org>
Date: Mon, 3 Mar 2014 21:31:24 +0000 (+1100)
Subject: powerpc: Align p_dyn, p_rela and p_st symbols
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67;p=deliverable%2Flinux.git

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>
---

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