diff options
author | Brian Gerst <brgerst@gmail.com> | 2009-12-09 12:34:44 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-10 19:41:31 -0500 |
commit | df59e7bf439918f523ac29e996ec1eebbed60440 (patch) | |
tree | a847eb0b7f0e3fe34a717999db0d441e7f7e7bd6 /arch/x86/kernel/process_32.c | |
parent | f443ff4201dd25cd4dec183f9919ecba90c8edc2 (diff) |
x86: Merge kernel_thread()
Signed-off-by: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1260380084-3707-6-git-send-email-brgerst@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/process_32.c')
-rw-r--r-- | arch/x86/kernel/process_32.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index f2e8b05a4f02..ccf234266a2e 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -192,42 +192,6 @@ void show_regs(struct pt_regs *regs) | |||
192 | show_trace(NULL, regs, ®s->sp, regs->bp); | 192 | show_trace(NULL, regs, ®s->sp, regs->bp); |
193 | } | 193 | } |
194 | 194 | ||
195 | /* | ||
196 | * This gets run with %si containing the | ||
197 | * function to call, and %di containing | ||
198 | * the "args". | ||
199 | */ | ||
200 | extern void kernel_thread_helper(void); | ||
201 | |||
202 | /* | ||
203 | * Create a kernel thread | ||
204 | */ | ||
205 | int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | ||
206 | { | ||
207 | struct pt_regs regs; | ||
208 | |||
209 | memset(®s, 0, sizeof(regs)); | ||
210 | |||
211 | regs.si = (unsigned long) fn; | ||
212 | regs.di = (unsigned long) arg; | ||
213 | |||
214 | #ifdef CONFIG_X86_32 | ||
215 | regs.ds = __USER_DS; | ||
216 | regs.es = __USER_DS; | ||
217 | regs.fs = __KERNEL_PERCPU; | ||
218 | regs.gs = __KERNEL_STACK_CANARY; | ||
219 | #endif | ||
220 | |||
221 | regs.orig_ax = -1; | ||
222 | regs.ip = (unsigned long) kernel_thread_helper; | ||
223 | regs.cs = __KERNEL_CS | get_kernel_rpl(); | ||
224 | regs.flags = X86_EFLAGS_IF | 0x2; | ||
225 | |||
226 | /* Ok, create the new process.. */ | ||
227 | return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL); | ||
228 | } | ||
229 | EXPORT_SYMBOL(kernel_thread); | ||
230 | |||
231 | void release_thread(struct task_struct *dead_task) | 195 | void release_thread(struct task_struct *dead_task) |
232 | { | 196 | { |
233 | BUG_ON(dead_task->mm); | 197 | BUG_ON(dead_task->mm); |