---

yaml --- r: 180454 b: refs/heads/master c: cf9db6c h: refs/heads/master v: v3
git-mirror · Feb 10, 2010 · d47ee7d · d47ee7d
1 parent 80fcb72
commit d47ee7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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