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.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.c')
-rw-r--r-- | arch/x86/kernel/process.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index f3c1a6b3a65e..8705ccedd447 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -243,6 +243,41 @@ sys_clone(unsigned long clone_flags, unsigned long newsp, | |||
243 | return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid); | 243 | return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid); |
244 | } | 244 | } |
245 | 245 | ||
246 | /* | ||
247 | * This gets run with %si containing the | ||
248 | * function to call, and %di containing | ||
249 | * the "args". | ||
250 | */ | ||
251 | extern void kernel_thread_helper(void); | ||
252 | |||
253 | /* | ||
254 | * Create a kernel thread | ||
255 | */ | ||
256 | int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | ||
257 | { | ||
258 | struct pt_regs regs; | ||
259 | |||
260 | memset(®s, 0, sizeof(regs)); | ||
261 | |||
262 | regs.si = (unsigned long) fn; | ||
263 | regs.di = (unsigned long) arg; | ||
264 | |||
265 | #ifdef CONFIG_X86_32 | ||
266 | regs.ds = __USER_DS; | ||
267 | regs.es = __USER_DS; | ||
268 | regs.fs = __KERNEL_PERCPU; | ||
269 | regs.gs = __KERNEL_STACK_CANARY; | ||
270 | #endif | ||
271 | |||
272 | regs.orig_ax = -1; | ||
273 | regs.ip = (unsigned long) kernel_thread_helper; | ||
274 | regs.cs = __KERNEL_CS | get_kernel_rpl(); | ||
275 | regs.flags = X86_EFLAGS_IF | 0x2; | ||
276 | |||
277 | /* Ok, create the new process.. */ | ||
278 | return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL); | ||
279 | } | ||
280 | EXPORT_SYMBOL(kernel_thread); | ||
246 | 281 | ||
247 | /* | 282 | /* |
248 | * sys_execve() executes a new program. | 283 | * sys_execve() executes a new program. |