From d47ee7d34d7bf119b080b06454bb3a917e6c868c Mon Sep 17 00:00:00 2001
From: "Serge E. Hallyn" <serue@us.ibm.com>
Date: Mon, 8 Feb 2010 20:35:02 -0600
Subject: [PATCH] --- yaml --- r: 180454 b: refs/heads/master c:
 cf9db6c41f739a294286847aab1e85f39aef1781 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/include/asm/system.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ef965e296322..5a1305087ba9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06df6dafb5d9e3cfa3588c6ce79328b91582b6af
+refs/heads/master: cf9db6c41f739a294286847aab1e85f39aef1781
diff --git a/trunk/arch/x86/include/asm/system.h b/trunk/arch/x86/include/asm/system.h
index ecb544e65382..e04740f7a0bb 100644
--- a/trunk/arch/x86/include/asm/system.h
+++ b/trunk/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