Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3dc5bec authored by Oskar Schirmer's avatar Oskar Schirmer Committed by Linus Torvalds
Browse files

flat: fix data sections alignment 



The flat loader uses an architecture's flat_stack_align() to align the
stack but assumes word-alignment is enough for the data sections.

However, on the Xtensa S6000 we have registers up to 128bit width
which can be used from userspace and therefor need userspace stack and
data-section alignment of at least this size.

This patch drops flat_stack_align() and uses the same alignment that
is required for slab caches, ARCH_SLAB_MINALIGN, or wordsize if it's
not defined by the architecture.

It also fixes m32r which was obviously kaput, aligning an
uninitialized stack entry instead of the stack pointer.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarOskar Schirmer <os@emlix.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Bryan Wu <cooloney@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarJohannes Weiner <jw@emlix.com>
Acked-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ba944719

arch/arm/include/asm/flat.h

+0 −3
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
#ifndef __ARM_FLAT_H__

#define __ARM_FLAT_H__



/* An odd number of words will be pushed after this alignment, so

   deliberately misalign the value.  */

#define	flat_stack_align(sp)	sp = (void *)(((unsigned long)(sp) - 4) | 4)

#define	flat_argvp_envp_on_stack()		1

#define	flat_old_ram_flag(flags)		(flags)

#define	flat_reloc_valid(reloc, size)		((reloc) <= (size))

arch/blackfin/include/asm/flat.h

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <asm/unaligned.h>



#define	flat_stack_align(sp)	/* nothing needed */

#define	flat_argvp_envp_on_stack()		0

#define	flat_old_ram_flag(flags)		(flags)

arch/h8300/include/asm/flat.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#ifndef __H8300_FLAT_H__

#define __H8300_FLAT_H__



#define	flat_stack_align(sp)			/* nothing needed */

#define	flat_argvp_envp_on_stack()		1

#define	flat_old_ram_flag(flags)		1

#define	flat_reloc_valid(reloc, size)		((reloc) <= (size))

arch/m32r/include/asm/flat.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#ifndef __ASM_M32R_FLAT_H

#define __ASM_M32R_FLAT_H



#define	flat_stack_align(sp)		(*sp += (*sp & 3 ? (4 - (*sp & 3)): 0))

#define	flat_argvp_envp_on_stack()		0

#define	flat_old_ram_flag(flags)		(flags)

#define	flat_set_persistent(relval, p)		0

arch/m68k/include/asm/flat.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#ifndef __M68KNOMMU_FLAT_H__

#define __M68KNOMMU_FLAT_H__



#define	flat_stack_align(sp)			/* nothing needed */

#define	flat_argvp_envp_on_stack()		1

#define	flat_old_ram_flag(flags)		(flags)

#define	flat_reloc_valid(reloc, size)		((reloc) <= (size))