lkml.org 
[lkml]   [2009]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/5] x86: Merge kernel_thread()
    Date
    Signed-off-by: Brian Gerst <brgerst@gmail.com>
    ---
    arch/x86/kernel/process.c | 35 +++++++++++++++++++++++++++++++++++
    arch/x86/kernel/process_32.c | 36 ------------------------------------
    arch/x86/kernel/process_64.c | 36 ------------------------------------
    3 files changed, 35 insertions(+), 72 deletions(-)

    diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
    index 5e2ba63..ac9ac64 100644
    --- a/arch/x86/kernel/process.c
    +++ b/arch/x86/kernel/process.c
    @@ -234,6 +234,41 @@ int sys_vfork(struct pt_regs *regs)
    NULL, NULL);
    }

    +/*
    + * This gets run with %si containing the
    + * function to call, and %di containing
    + * the "args".
    + */
    +extern void kernel_thread_helper(void);
    +
    +/*
    + * Create a kernel thread
    + */
    +int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
    +{
    + struct pt_regs regs;
    +
    + memset(&regs, 0, sizeof(regs));
    +
    + 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 | 0x2;
    +
    + /* Ok, create the new process.. */
    + return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
    +}
    +EXPORT_SYMBOL(kernel_thread);

    /*
    * Idle related variables and functions
    diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
    index e45aa22..af2bf74 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)
    show_trace(NULL, regs, &regs->sp, regs->bp);
    }

    -/*
    - * This gets run with %si containing the
    - * function to call, and %di containing
    - * the "args".
    - */
    -extern void kernel_thread_helper(void);
    -
    -/*
    - * Create a kernel thread
    - */
    -int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
    -{
    - struct pt_regs regs;
    -
    - memset(&regs, 0, sizeof(regs));
    -
    - 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 | 0x2;
    -
    - /* Ok, create the new process.. */
    - return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
    -}
    -EXPORT_SYMBOL(kernel_thread);
    -
    void release_thread(struct task_struct *dead_task)
    {
    BUG_ON(dead_task->mm);
    diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
    index 54c9939..09d3a7b 100644
    --- a/arch/x86/kernel/process_64.c
    +++ b/arch/x86/kernel/process_64.c
    @@ -229,42 +229,6 @@ void show_regs(struct pt_regs *regs)
    show_trace(NULL, regs, (void *)(regs + 1), regs->bp);
    }

    -/*
    - * This gets run with %si containing the
    - * function to call, and %di containing
    - * the "args".
    - */
    -extern void kernel_thread_helper(void);
    -
    -/*
    - * Create a kernel thread
    - */
    -int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
    -{
    - struct pt_regs regs;
    -
    - memset(&regs, 0, sizeof(regs));
    -
    - 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 | 0x2;
    -
    - /* Ok, create the new process.. */
    - return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
    -}
    -EXPORT_SYMBOL(kernel_thread);
    -
    void release_thread(struct task_struct *dead_task)
    {
    if (dead_task->mm) {
    --
    1.6.5.2


    \
     
     \ /
      Last update: 2009-12-09 18:39    [W:0.027 / U:29.716 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site