lkml.org 
[lkml]   [2008]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH -next-20080709] fixup stop_machine use cpu mask vs ftrace


    Hi Rusty, Ingo.

    Rusty's patch [PATCH 3/3] stop_machine: use cpu mask rather than magic numbers
    didn't find kernel/trace/ftrace.c in -next, causing an immediate almost NULL
    pointer dereference in ftrace_dynamic_init.


    Signed-off-by: Milton Miller <miltonm@bga.com>

    diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
    index 0f271c4..c29acb5 100644
    --- a/kernel/trace/ftrace.c
    +++ b/kernel/trace/ftrace.c
    @@ -587,7 +587,7 @@ static int __ftrace_modify_code(void *data)

    static void ftrace_run_update_code(int command)
    {
    - stop_machine_run(__ftrace_modify_code, &command, NR_CPUS);
    + stop_machine_run(__ftrace_modify_code, &command, NULL);
    }

    void ftrace_disable_daemon(void)
    @@ -787,7 +787,7 @@ static int ftrace_update_code(void)
    !ftrace_enabled || !ftraced_trigger)
    return 0;

    - stop_machine_run(__ftrace_update_code, NULL, NR_CPUS);
    + stop_machine_run(__ftrace_update_code, NULL, NULL);

    return 1;
    }
    @@ -1564,7 +1564,7 @@ static int __init ftrace_dynamic_init(void)

    addr = (unsigned long)ftrace_record_ip;

    - stop_machine_run(ftrace_dyn_arch_init, &addr, NR_CPUS);
    + stop_machine_run(ftrace_dyn_arch_init, &addr, NULL);

    /* ftrace_dyn_arch_init places the return code in addr */
    if (addr) {

    \
     
     \ /
      Last update: 2008-07-10 23:43    [W:0.022 / U:0.304 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site