mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-04-20 21:33:58 +00:00
x86-64: merge the standard and compat start_thread() functions
The only thing left that differs between the standard and compat start_thread functions is the actual segment numbers and the prototype, so have a single common function which contains the guts and two very small wrappers. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
This commit is contained in:
parent
a6f05a6a0a
commit
e634d8fc79
1 changed files with 17 additions and 22 deletions
|
@ -344,18 +344,20 @@ out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
|
start_thread_common(struct pt_regs *regs, unsigned long new_ip,
|
||||||
|
unsigned long new_sp,
|
||||||
|
unsigned int _cs, unsigned int _ss, unsigned int _ds)
|
||||||
{
|
{
|
||||||
loadsegment(fs, 0);
|
loadsegment(fs, 0);
|
||||||
loadsegment(es, 0);
|
loadsegment(es, _ds);
|
||||||
loadsegment(ds, 0);
|
loadsegment(ds, _ds);
|
||||||
load_gs_index(0);
|
load_gs_index(0);
|
||||||
regs->ip = new_ip;
|
regs->ip = new_ip;
|
||||||
regs->sp = new_sp;
|
regs->sp = new_sp;
|
||||||
percpu_write(old_rsp, new_sp);
|
percpu_write(old_rsp, new_sp);
|
||||||
regs->cs = __USER_CS;
|
regs->cs = _cs;
|
||||||
regs->ss = __USER_DS;
|
regs->ss = _ss;
|
||||||
regs->flags = X86_EFLAGS_IF;
|
regs->flags = X86_EFLAGS_IF;
|
||||||
set_fs(USER_DS);
|
set_fs(USER_DS);
|
||||||
/*
|
/*
|
||||||
|
@ -363,26 +365,19 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
|
||||||
*/
|
*/
|
||||||
free_thread_xstate(current);
|
free_thread_xstate(current);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(start_thread);
|
|
||||||
|
void
|
||||||
|
start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
|
||||||
|
{
|
||||||
|
start_thread_common(regs, new_ip, new_sp,
|
||||||
|
__USER_CS, __USER_DS, 0);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_IA32_EMULATION
|
#ifdef CONFIG_IA32_EMULATION
|
||||||
void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp)
|
void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp)
|
||||||
{
|
{
|
||||||
loadsegment(fs, 0);
|
start_thread_common(regs, new_ip, new_sp,
|
||||||
loadsegment(ds, __USER32_DS);
|
__USER32_CS, __USER32_DS, __USER32_DS);
|
||||||
loadsegment(es, __USER32_DS);
|
|
||||||
load_gs_index(0);
|
|
||||||
regs->ip = new_ip;
|
|
||||||
regs->sp = new_sp;
|
|
||||||
percpu_write(old_rsp, new_sp);
|
|
||||||
regs->cs = __USER32_CS;
|
|
||||||
regs->ss = __USER32_DS;
|
|
||||||
regs->flags = X86_EFLAGS_IF;
|
|
||||||
set_fs(USER_DS);
|
|
||||||
/*
|
|
||||||
* Free the old FP and other extended state
|
|
||||||
*/
|
|
||||||
free_thread_xstate(current);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue