diff options
| author | Anton Blanchard <anton@samba.org> | 2013-12-22 20:19:51 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 15:24:22 -0500 |
| commit | 96350a7067c73a288af679f3420431cabe9453bc (patch) | |
| tree | b27c4fc2b7869b641438c4178f7722c14eb225e3 /arch/powerpc/kernel | |
| parent | 4e639053aacb787a762e3dea49f4d3a6c13a52e7 (diff) | |
powerpc: Align p_end
commit 286e4f90a72c0b0621dde0294af6ed4b0baddabb upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index b61363d557b5..192a3f562bdb 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
| @@ -467,6 +467,7 @@ _STATIC(__after_prom_start) | |||
| 467 | mtctr r8 | 467 | mtctr r8 |
| 468 | bctr | 468 | bctr |
| 469 | 469 | ||
| 470 | .balign 8 | ||
| 470 | p_end: .llong _end - _stext | 471 | p_end: .llong _end - _stext |
| 471 | 472 | ||
| 472 | 4: /* Now copy the rest of the kernel up to _end */ | 473 | 4: /* Now copy the rest of the kernel up to _end */ |