From 95aa07afa3f413f3adbbdb23cd9555efd70ae9d1 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 30 Jan 2008 13:31:24 +0100 Subject: [PATCH] --- yaml --- r: 80015 b: refs/heads/master c: ded9aa0db815b4e1271001561e177755cb8b9468 h: refs/heads/master i: 80013: a070905a74ae3865644a8fbdd811ed66754e308e 80011: 000da9470516a09e7a2e6fb053d8e562ebff1481 80007: 3b622ed7aa930b3302708888a32c3c17ab195220 79999: 44364b8fa2543c89cecce40017fc01758cc00d8d v: v3 --- [refs] | 2 +- trunk/include/asm-x86/system.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) 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 #include +/* 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" \