* [PATCH RFC] Make AT_VECTOR_SIZE_ARCH 2 for x86-32
@ 2010-02-09 2:35 Serge E. Hallyn
2010-02-10 0:06 ` [tip:x86/urgent] x86-32: Make AT_VECTOR_SIZE_ARCH=2 tip-bot for Serge E. Hallyn
0 siblings, 1 reply; 2+ messages in thread
From: Serge E. Hallyn @ 2010-02-09 2:35 UTC (permalink / raw)
To: lkml; +Cc: Ingo Molnar, Brian Gerst
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.
Am I on crack?
Signed-off-by: Serge E. Hallyn <serue@us.ibm.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
--
1.6.0.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/urgent] x86-32: Make AT_VECTOR_SIZE_ARCH=2
2010-02-09 2:35 [PATCH RFC] Make AT_VECTOR_SIZE_ARCH 2 for x86-32 Serge E. Hallyn
@ 2010-02-10 0:06 ` tip-bot for Serge E. Hallyn
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Serge E. Hallyn @ 2010-02-10 0:06 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, serue, tglx
Commit-ID: cf9db6c41f739a294286847aab1e85f39aef1781
Gitweb: http://git.kernel.org/tip/cf9db6c41f739a294286847aab1e85f39aef1781
Author: Serge E. Hallyn <serue@us.ibm.com>
AuthorDate: Mon, 8 Feb 2010 20:35:02 -0600
Committer: H. Peter Anvin <hpa@zytor.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@us.ibm.com>
LKML-Reference: <20100209023502.GA15408@us.ibm.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-10 0:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-09 2:35 [PATCH RFC] Make AT_VECTOR_SIZE_ARCH 2 for x86-32 Serge E. Hallyn
2010-02-10 0:06 ` [tip:x86/urgent] x86-32: Make AT_VECTOR_SIZE_ARCH=2 tip-bot for Serge E. Hallyn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome