x86: also define AT_VECTOR_SIZE_ARCH

The patch introducing this left out x86-64, despite it also having
extra entries.

[ mingo@elte.hu: re-merged this to after the unification patches. ]

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
index 8a37dad38bc0ed03d201aa9987e883258bf44b3e..6c7d1fda499549245d371a37d8832d2e1fac7ad3 100644 (file)
--- a/include/asm-x86/system.h
+++ b/include/asm-x86/system.h
@@ -9,8 +9,14 @@
 #include <linux/kernel.h>
 #include <linux/irqflags.h>
 
 #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
 #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,
 
 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) \
 
 /* 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"                                       \
             "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */       \
             "movq %P[threadrsp](%[next]),%%rsp\n\t" /* restore RSP */    \
             "call __switch_to\n\t"                                       \