Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[PATCH RFC] Make AT_VECTOR_SIZE_ARCH 2 for x86-32

0 views
Skip to first unread message

Serge E. Hallyn

unread,
Feb 9, 2010, 2:40:01 AM2/9/10
to
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 <se...@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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

tip-bot for Serge E. Hallyn

unread,
Feb 10, 2010, 12:10:02 AM2/10/10
to
Commit-ID: cf9db6c41f739a294286847aab1e85f39aef1781
Gitweb: http://git.kernel.org/tip/cf9db6c41f739a294286847aab1e85f39aef1781
Author: Serge E. Hallyn <se...@us.ibm.com>
AuthorDate: Mon, 8 Feb 2010 20:35:02 -0600
Committer: H. Peter Anvin <h...@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 <se...@us.ibm.com>
LKML-Reference: <20100209023...@us.ibm.com>
Signed-off-by: H. Peter Anvin <h...@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

--

0 new messages