diff --git a/[refs] b/[refs]
index 15a65b1eb9aa..d2f309f66598 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e94271017f0933b29362a3c9dea5a6b9d04d98e1
+refs/heads/master: ded9aa0db815b4e1271001561e177755cb8b9468
diff --git a/trunk/include/asm-x86/system.h b/trunk/include/asm-x86/system.h
index 8a37dad38bc0..6c7d1fda4995 100644
--- a/trunk/include/asm-x86/system.h
+++ b/trunk/include/asm-x86/system.h
@@ -9,8 +9,14 @@
 #include <linux/kernel.h>
 #include <linux/irqflags.h>
 
+/* entries in ARCH_DLINFO: */
+#ifdef CONFIG_IA32_EMULATION
+# define AT_VECTOR_SIZE_ARCH 2
+#else
+# define AT_VECTOR_SIZE_ARCH 1
+#endif
+
 #ifdef CONFIG_X86_32
-#define AT_VECTOR_SIZE_ARCH 2 /* entries in ARCH_DLINFO */
 
 struct task_struct; /* one of the stranger aspects of C forward declarations */
 extern struct task_struct *FASTCALL(__switch_to(struct task_struct *prev,
@@ -56,7 +62,7 @@ extern struct task_struct *FASTCALL(__switch_to(struct task_struct *prev,
 
 /* Save restore flags to clear handle leaking NT */
 #define switch_to(prev, next, last) \
-	asm volatile(SAVE_CONTEXT					  \
+	asm volatile(SAVE_CONTEXT						    \
 	     "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */	  \
 	     "movq %P[threadrsp](%[next]),%%rsp\n\t" /* restore RSP */	  \
 	     "call __switch_to\n\t"					  \