diff options
author | Brian Gerst <brgerst@gmail.com> | 2009-12-09 18:34:43 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 00:55:39 +0100 |
commit | f443ff4201dd25cd4dec183f9919ecba90c8edc2 (patch) | |
tree | 4da9d9c35e46c68b87b180285517cc6323bd5d03 /arch/x86/kernel/process_32.c | |
parent | x86, 32-bit: Use same regs as 64-bit for kernel_thread_helper (diff) | |
download | linux-f443ff4201dd25cd4dec183f9919ecba90c8edc2.tar.xz linux-f443ff4201dd25cd4dec183f9919ecba90c8edc2.zip |
x86: Sync 32/64-bit kernel_thread
Signed-off-by: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1260380084-3707-5-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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index bd874d2b6ab1..f2e8b05a4f02 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -211,14 +211,17 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) regs.si = (unsigned long) fn; regs.di = (unsigned long) arg; +#ifdef CONFIG_X86_32 regs.ds = __USER_DS; regs.es = __USER_DS; regs.fs = __KERNEL_PERCPU; regs.gs = __KERNEL_STACK_CANARY; +#endif + regs.orig_ax = -1; regs.ip = (unsigned long) kernel_thread_helper; regs.cs = __KERNEL_CS | get_kernel_rpl(); - regs.flags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2; + regs.flags = X86_EFLAGS_IF | 0x2; /* Ok, create the new process.. */ return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL); |