diff options
| author | Al Viro | 2012-09-20 15:28:25 +0200 |
|---|---|---|
| committer | Richard Weinberger | 2012-09-27 18:04:55 +0200 |
| commit | d2ce4e92fa4f79a5fdb4cc912b411280afe21697 (patch) | |
| tree | d7b1cae518d150b30342cef8dfa1a76e82005d25 /arch/um/kernel/process.c | |
| parent | um: let signal_delivered() do SIGTRAP on singlestepping into handler (diff) | |
| download | kernel-qcow2-linux-d2ce4e92fa4f79a5fdb4cc912b411280afe21697.tar.gz kernel-qcow2-linux-d2ce4e92fa4f79a5fdb4cc912b411280afe21697.tar.xz kernel-qcow2-linux-d2ce4e92fa4f79a5fdb4cc912b411280afe21697.zip | |
um: kill thread->forking
we only use that to tell copy_thread() done by syscall from that
done by kernel_thread(). However, it's easier to do simply by
checking PF_KTHREAD in thread flags.
Merge sys_clone() guts for 32bit and 64bit, while we are at it...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/um/kernel/process.c')
| -rw-r--r-- | arch/um/kernel/process.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 57fc7028714a..c5f5afa50745 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -181,11 +181,12 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, struct pt_regs *regs) { void (*handler)(void); + int kthread = current->flags & PF_KTHREAD; int ret = 0; p->thread = (struct thread_struct) INIT_THREAD; - if (current->thread.forking) { + if (!kthread) { memcpy(&p->thread.regs.regs, ®s->regs, sizeof(p->thread.regs.regs)); PT_REGS_SET_SYSCALL_RETURN(&p->thread.regs, 0); @@ -195,8 +196,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, handler = fork_handler; arch_copy_thread(¤t->thread.arch, &p->thread.arch); - } - else { + } else { get_safe_registers(p->thread.regs.regs.gp, p->thread.regs.regs.fp); p->thread.request.u.thread = current->thread.request.u.thread; handler = new_thread_handler; @@ -204,7 +204,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, new_thread(task_stack_page(p), &p->thread.switch_buf, handler); - if (current->thread.forking) { + if (!kthread) { clear_flushed_tls(p); /* |