Skip to contentSkip to conversation

Make AT_VECTOR_SIZE_ARCH 2 for x86-32

RFC PATCH In review Serge E. Hallyn 1 participant 2 messages Feb 9, 2010 – Feb 10, 2010 x86

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 Make AT_VECTOR_SIZE_ARCH 2 for x86-32

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?

---
 arch/x86/include/asm/system.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/system.h +2 -2
index ecb544e..e04740f 100644
@@ -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
 
Signature · 1 line
1.6.0.4
#1 lore raw

[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 <[email protected]>
AuthorDate: Mon, 8 Feb 2010 20:35:02 -0600
Committer:  H. Peter Anvin <[email protected]>
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.

LKML-Reference: <[email protected]>

---
 arch/x86/include/asm/system.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/system.h +2 -2
index ecb544e..e04740f 100644
@@ -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