From: Grant Likely Date: Mon, 22 Oct 2007 22:38:32 +0000 (-0600) Subject: ppc: fix AT_VECTOR_SIZE on arch/ppc X-Git-Tag: v2.6.24-rc1~67 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3650b0a304663d98a63c68f9020eb1ded477989e;p=linux-2.6 ppc: fix AT_VECTOR_SIZE on arch/ppc Commit 4f9a58d75bfe82ab2b8ba5b8506dfb190a267834 ("increase AT_VECTOR_SIZE to terminate saved_auxv properly") changes the size of AT_VECTOR_SIZE from hard coded '44' to a calculation based on the value of AT_VECTOR_SIZE_ARCH and AT_VECTOR_SIZE_BASE. The change works for arch/powerpc, but it breaks arch/ppc because the needed AT_VECTOR_SIZE_ARCH is not present in include/asm-ppc/system.h and a default value of 0 is used instead. This results in AT_VECTOR_SIZE being too small and it causes a kernel crash on loading init. Signed-off-by: Grant Likely Signed-off-by: Linus Torvalds --- diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h index cc45780421..51df94c738 100644 --- a/include/asm-ppc/system.h +++ b/include/asm-ppc/system.h @@ -33,6 +33,7 @@ #define set_mb(var, value) do { var = value; mb(); } while (0) +#define AT_VECTOR_SIZE_ARCH 6 /* entries in ARCH_DLINFO */ #ifdef CONFIG_SMP #define smp_mb() mb() #define smp_rmb() rmb()