On Wed, 2013-07-03 at 00:23 +0200, Oleg Nesterov wrote:

>  /* Remove an event_call */
> -void trace_remove_event_call(struct ftrace_event_call *call)
> +int trace_remove_event_call(struct ftrace_event_call *call)
>  {
> +     int err;
> +
>       mutex_lock(&event_mutex);
>       down_write(&trace_event_sem);

Oh, BTW, can you rebase this on top of my for-next branch. That's what
I'll be pushing off to Linus, and this will conflict with those changes.

-- Steve

 git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git


> -     __trace_remove_event_call(call);
> +     err = event_can_remove(call);
> +     if (!err)
> +             __trace_remove_event_call(call);
>       up_write(&trace_event_sem);
>       mutex_unlock(&event_mutex);
> +
> +     return err;
>  }
>  
>  #define for_each_event(event, start, end)                    \


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to