diff --git a/[refs] b/[refs]
index d34b7edb5239..5b1e5a1040c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b0122faf4833548072d23f3c3063c23bc289746
+refs/heads/master: 213fde71024223abcdd7d9e5349d1ea2679227b5
diff --git a/trunk/include/asm-x86/system_64.h b/trunk/include/asm-x86/system_64.h
index 4cb23848d460..6e9e4841a2da 100644
--- a/trunk/include/asm-x86/system_64.h
+++ b/trunk/include/asm-x86/system_64.h
@@ -7,6 +7,13 @@
 
 #ifdef __KERNEL__
 
+/* entries in ARCH_DLINFO: */
+#ifdef CONFIG_IA32_EMULATION
+# define AT_VECTOR_SIZE_ARCH 2
+#else
+# define AT_VECTOR_SIZE_ARCH 1
+#endif
+
 #define __SAVE(reg,offset) "movq %%" #reg ",(14-" #offset ")*8(%%rsp)\n\t"
 #define __RESTORE(reg,offset) "movq (14-" #offset ")*8(%%rsp),%%" #reg "\n\t"