diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2017-03-07 16:14:49 +1100 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2017-05-17 15:07:00 -0400 |
commit | e04d8b65f4124848640fa67511f2a63692dd8ad8 (patch) | |
tree | 40f320976b532af9c85dd80bc2756678a206e648 /arch/powerpc | |
parent | 5c8f767c657b501ce6093784ca4f0c10b05287ab (diff) |
powerpc/boot: Fix zImage TOC alignment
[ Upstream commit 97ee351b50a49717543533cfb85b4bf9d88c9680 ]
Recent toolchains force the TOC to be 256 byte aligned. We need to
enforce this alignment in the zImage linker script, otherwise pointers
to our TOC variables (__toc_start) could be incorrect. If the actual
start of the TOC and __toc_start don't have the same value we crash
early in the zImage wrapper.
Cc: stable@vger.kernel.org
Suggested-by: Alan Modra <amodra@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/boot/zImage.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/zImage.lds.S b/arch/powerpc/boot/zImage.lds.S index 861e72109df2..f080abfc2f83 100644 --- a/arch/powerpc/boot/zImage.lds.S +++ b/arch/powerpc/boot/zImage.lds.S @@ -68,6 +68,7 @@ SECTIONS } #ifdef CONFIG_PPC64_BOOT_WRAPPER + . = ALIGN(256); .got : { __toc_start = .; |