[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-cf9db6c41f739a294286847aab1e85f39aef1781@git.kernel.org>
Date: Wed, 10 Feb 2010 00:06:38 GMT
From: "tip-bot for Serge E. Hallyn" <serue@...ibm.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
serue@...ibm.com, tglx@...utronix.de
Subject: [tip:x86/urgent] x86-32: Make AT_VECTOR_SIZE_ARCH=2
Commit-ID: cf9db6c41f739a294286847aab1e85f39aef1781
Gitweb: http://git.kernel.org/tip/cf9db6c41f739a294286847aab1e85f39aef1781
Author: Serge E. Hallyn <serue@...ibm.com>
AuthorDate: Mon, 8 Feb 2010 20:35:02 -0600
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Tue, 9 Feb 2010 16:05:08 -0800
x86-32: Make AT_VECTOR_SIZE_ARCH=2
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@...ibm.com>
LKML-Reference: <20100209023502.GA15408@...ibm.com>
Signed-off-by: H. Peter Anvin <hpa@...or.com>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists