diff mbox

powerpc: Align p_dyn, p_rela and p_st symbols

Message ID 20140304083124.0c7c29a2@kryten (mailing list archive)
State Accepted
Commit a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67
Headers show

Commit Message

Anton Blanchard March 3, 2014, 9:31 p.m. UTC 
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
---

Comments

Laurent Dufour March 4, 2014, 3:45 p.m. UTC | #1 
On 03/03/2014 22:31, Anton Blanchard wrote:
> 
> 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

Fix the issue I was seeing when booting a LE kernel in a KVM guest on my
P7 box.

Tested-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>

> ---
> 
> diff --git a/arch/powerpc/kernel/reloc_64.S b/arch/powerpc/kernel/reloc_64.S
> index 1482327..d88736f 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
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
diff mbox

Patch

diff --git a/arch/powerpc/kernel/reloc_64.S b/arch/powerpc/kernel/reloc_64.S
index 1482327..d88736f 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