FLAT: tweak default stack alignment
in [Kernel]
|
Prev: [PATCH 7/8] ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case
Next: [PATCH] checkpatch: refactor 'allowed asm includes' and add memory.h
From: David McCullough on 28 May 2010 02:30 Jivin Mike Frysinger lays it down ... > The recent commit 1f0ce8b3dd667dca7 which moved the ARCH_SLAB_MINALIGN > default into the global header inadvertently broke FLAT for a bunch of > systems. Blackfin systems now fail on any FLAT exec with: > Unable to read code+data+bss, errno 14 > When your /init is a FLAT binary, obviously this can be annoying ;). > > This stems from the alignment usage in the FLAT loader. The behavior > before was that FLAT would default to ARCH_SLAB_MINALIGN only if it was > defined, and this was only defined by arches when they wanted a larger > alignment value. Otherwise it'd default to pointer alignment. Arguably, > this is kind of hokey that the FLAT is semi-abusing defines it shouldn't. > > But let's ignore that and simply ignore min alignment values of 0. > > Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> Acked-by: David McCullough <david_mccullough(a)mcafee.com> Cheers, Davidm > --- > v2 > - split changes & document better > > fs/binfmt_flat.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c > index b865622..4959a0a 100644 > --- a/fs/binfmt_flat.c > +++ b/fs/binfmt_flat.c > @@ -68,7 +68,7 @@ > * Here we can be a bit looser than the data sections since this > * needs to only meet arch ABI requirements. > */ > -#ifdef ARCH_SLAB_MINALIGN > +#if defined(ARCH_SLAB_MINALIGN) && ARCH_SLAB_MINALIGN != 0 > #define FLAT_STACK_ALIGN (ARCH_SLAB_MINALIGN) > #else > #define FLAT_STACK_ALIGN (sizeof(void *)) > -- > 1.7.1 > > > -- David McCullough, david_mccullough(a)mcafee.com, Ph:+61 734352815 McAfee - SnapGear http://www.mcafee.com http://www.uCdot.org -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg Ungerer on 28 May 2010 02:40
Mike Frysinger wrote: > The recent commit 1f0ce8b3dd667dca7 which moved the ARCH_SLAB_MINALIGN > default into the global header inadvertently broke FLAT for a bunch of > systems. Blackfin systems now fail on any FLAT exec with: > Unable to read code+data+bss, errno 14 > When your /init is a FLAT binary, obviously this can be annoying ;). > > This stems from the alignment usage in the FLAT loader. The behavior > before was that FLAT would default to ARCH_SLAB_MINALIGN only if it was > defined, and this was only defined by arches when they wanted a larger > alignment value. Otherwise it'd default to pointer alignment. Arguably, > this is kind of hokey that the FLAT is semi-abusing defines it shouldn't. > > But let's ignore that and simply ignore min alignment values of 0. > > Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> Acked-by: Greg Ungerer <gerg(a)uclinux.org> > --- > v2 > - split changes & document better > > fs/binfmt_flat.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c > index b865622..4959a0a 100644 > --- a/fs/binfmt_flat.c > +++ b/fs/binfmt_flat.c > @@ -68,7 +68,7 @@ > * Here we can be a bit looser than the data sections since this > * needs to only meet arch ABI requirements. > */ > -#ifdef ARCH_SLAB_MINALIGN > +#if defined(ARCH_SLAB_MINALIGN) && ARCH_SLAB_MINALIGN != 0 > #define FLAT_STACK_ALIGN (ARCH_SLAB_MINALIGN) > #else > #define FLAT_STACK_ALIGN (sizeof(void *)) -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg(a)snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |