diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-10-08 21:02:54 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-10-09 19:26:38 -0400 |
commit | a6f05a6a0a1713d5b019f096799d49226807d3df (patch) | |
tree | 0f6e0527309355796234f095ec9103a7f1fac5c5 /arch/x86/kernel/process_64.c | |
parent | 36a07902c2134649c4af7f07980413ffb1a56085 (diff) |
x86-64: make compat_start_thread() match start_thread()
For no real good reason, compat_start_thread() was embedded inline in
<asm/elf.h> whereas the native start_thread() lives in process_*.c.
Move compat_start_thread() to process_64.c, remove gratuitious
differences, and fix a few items which mostly look like bit rot.
In particular, compat_start_thread() didn't do free_thread_xstate(),
which means it was hanging on to the xstate store area even when it
was not needed. It was also not setting old_rsp, but it looks like
that generally shouldn't matter for a 32-bit process.
Note: compat_start_thread *has* to be a macro, since it is tested with
start_thread_ia32() as the out of line function name.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Diffstat (limited to 'arch/x86/kernel/process_64.c')
-rw-r--r-- | arch/x86/kernel/process_64.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index ad535b683170..7cf0a6b6d4bb 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -356,7 +356,7 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) | |||
356 | percpu_write(old_rsp, new_sp); | 356 | percpu_write(old_rsp, new_sp); |
357 | regs->cs = __USER_CS; | 357 | regs->cs = __USER_CS; |
358 | regs->ss = __USER_DS; | 358 | regs->ss = __USER_DS; |
359 | regs->flags = 0x200; | 359 | regs->flags = X86_EFLAGS_IF; |
360 | set_fs(USER_DS); | 360 | set_fs(USER_DS); |
361 | /* | 361 | /* |
362 | * Free the old FP and other extended state | 362 | * Free the old FP and other extended state |
@@ -365,6 +365,27 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) | |||
365 | } | 365 | } |
366 | EXPORT_SYMBOL_GPL(start_thread); | 366 | EXPORT_SYMBOL_GPL(start_thread); |
367 | 367 | ||
368 | #ifdef CONFIG_IA32_EMULATION | ||
369 | void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp) | ||
370 | { | ||
371 | loadsegment(fs, 0); | ||
372 | loadsegment(ds, __USER32_DS); | ||
373 | loadsegment(es, __USER32_DS); | ||
374 | load_gs_index(0); | ||
375 | regs->ip = new_ip; | ||
376 | regs->sp = new_sp; | ||
377 | percpu_write(old_rsp, new_sp); | ||
378 | regs->cs = __USER32_CS; | ||
379 | regs->ss = __USER32_DS; | ||
380 | regs->flags = X86_EFLAGS_IF; | ||
381 | set_fs(USER_DS); | ||
382 | /* | ||
383 | * Free the old FP and other extended state | ||
384 | */ | ||
385 | free_thread_xstate(current); | ||
386 | } | ||
387 | #endif | ||
388 | |||
368 | /* | 389 | /* |
369 | * switch_to(x,y) should switch tasks from x to y. | 390 | * switch_to(x,y) should switch tasks from x to y. |
370 | * | 391 | * |