Sent it a few hours ago. http://lkml.org/lkml/2010/2/8/388 Quoting Oren Laadan (orenl@xxxxxxxxxxxxxxx): > > Are you going to send this to mainline ? > > serue@xxxxxxxxxx wrote: > > From: Serge E. Hallyn <serue@xxxxxxxxxx> > > > > Both x86-32 and x86-64 with 32-bit compat use ARCH_DLINFO_IA32, > > which defines two saved_auxv entries. But system.h only defines > > AT_VECTOR_SIZE_ARCH as 2 for CONFIG_IA32_EMULATION, not for > > CONFIG_X86_32. Fix that. > > > > Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx> > > --- > > arch/x86/include/asm/system.h | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h > > index ecb544e..e04740f 100644 > > --- a/arch/x86/include/asm/system.h > > +++ b/arch/x86/include/asm/system.h > > @@ -11,9 +11,9 @@ > > #include <linux/irqflags.h> > > > > /* entries in ARCH_DLINFO: */ > > -#ifdef CONFIG_IA32_EMULATION > > +#if defined(CONFIG_IA32_EMULATION) || !defined(CONFIG_X86_64) > > # define AT_VECTOR_SIZE_ARCH 2 > > -#else > > +#else /* else it's non-compat x86-64 */ > > # define AT_VECTOR_SIZE_ARCH 1 > > #endif > > > _______________________________________________ > Containers mailing list > Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx > https://lists.linux-foundation.org/mailman/listinfo/containers _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers
