summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2013-12-23 02:19:51 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-12-30 04:02:33 +0100
commit286e4f90a72c0b0621dde0294af6ed4b0baddabb (patch)
tree1c26315d0b64a12c0e09f37198df708f4bf3fad6
parentpowernv/eeh: Add buffer for P7IOC hub error data (diff)
downloadlinux-286e4f90a72c0b0621dde0294af6ed4b0baddabb.tar.xz
linux-286e4f90a72c0b0621dde0294af6ed4b0baddabb.zip
powerpc: Align p_end
p_end is an 8 byte value embedded in the text section. This means it is only 4 byte aligned when it should be 8 byte aligned. Fix this by adding an explicit alignment. This fixes an issue where POWER7 little endian builds with CONFIG_RELOCATABLE=y fail to boot. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/head_64.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 2ae41aba4053..fad2abdcbdfe 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -470,6 +470,7 @@ _STATIC(__after_prom_start)
mtctr r8
bctr
+.balign 8
p_end: .llong _end - _stext
4: /* Now copy the rest of the kernel up to _end */