korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-22 02:24:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'x86-process-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'x86-process-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-64: merge the standard and compat start_thread() functions
  x86-64: make compat_start_thread() match start_thread()
This commit is contained in:
Linus Torvalds 2009-12-08 13:34:53 -08:00
commit e7522ed5c0
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/include/asm/elf.h
View File

@ -157,19 +157,6 @@ do { \
#define compat_elf_check_arch(x) elf_check_arch_ia32(x) #define compat_elf_check_arch(x) elf_check_arch_ia32(x)
static inline void start_ia32_thread(struct pt_regs *regs, u32 ip, u32 sp)
{
loadsegment(fs, 0);
loadsegment(ds, __USER32_DS);
loadsegment(es, __USER32_DS);
load_gs_index(0);
regs->ip = ip;
regs->sp = sp;
regs->flags = X86_EFLAGS_IF;
regs->cs = __USER32_CS;
regs->ss = __USER32_DS;
}
static inline void elf_common_init(struct thread_struct *t, static inline void elf_common_init(struct thread_struct *t,
struct pt_regs *regs, const u16 ds) struct pt_regs *regs, const u16 ds)
{ {
@ -191,11 +178,8 @@ do { \
#define COMPAT_ELF_PLAT_INIT(regs, load_addr) \ #define COMPAT_ELF_PLAT_INIT(regs, load_addr) \
elf_common_init(&current->thread, regs, __USER_DS) elf_common_init(&current->thread, regs, __USER_DS)
#define compat_start_thread(regs, ip, sp) \ void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp);
do { \ #define compat_start_thread start_thread_ia32
start_ia32_thread(regs, ip, sp); \
set_fs(USER_DS); \
} while (0)
#define COMPAT_SET_PERSONALITY(ex) \ #define COMPAT_SET_PERSONALITY(ex) \
do { \ do { \

32
arch/x86/kernel/process_64.c
View File

@ -349,26 +349,42 @@ 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 = 0x200; regs->flags = X86_EFLAGS_IF;
set_fs(USER_DS); set_fs(USER_DS);
/* /*
* Free the old FP and other extended state * Free the old FP and other extended state
*/ */
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
void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp)
{
start_thread_common(regs, new_ip, new_sp,
__USER32_CS, __USER32_DS, __USER32_DS);
}
#endif
/* /*
* switch_to(x,y) should switch tasks from x to y. * switch_to(x,y) should switch tasks from x to y.