lkml.org 
[lkml]   [2009]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH tracing/kprobes 3/6] ftrace: Fix trace_remove_event_call() to lock trace_event_mutex
On Tue, Sep 15, 2009 at 11:17:30PM -0400, Steven Rostedt wrote:
> On Mon, 2009-09-14 at 16:49 -0400, Masami Hiramatsu wrote:
>
> >
> > diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
> > index 38e82a5..a3d6bad 100644
> > --- a/kernel/trace/trace_events.c
> > +++ b/kernel/trace/trace_events.c
> > @@ -1055,6 +1055,9 @@ static void remove_subsystem_dir(const char *name)
> > }
> > }
> >
> > +/*
> > + * Must be called under locking both of event_mutex and trace_event_mutex.
> > + */
> > static void __trace_remove_event_call(struct ftrace_event_call *call)
> > {
> > ftrace_event_enable_disable(call, 0);
> > @@ -1071,7 +1074,9 @@ static void __trace_remove_event_call(struct ftrace_event_call *call)
> > void trace_remove_event_call(struct ftrace_event_call *call)
>
> Is this from a previous patch set, because I can't find this in either
> my tree or tip/master.
>
> -- Steve


It's in tip:/tracing/kprobes, which is not merged into tip/master.
I have some pending updates in my tracing/kprobes tree:

Frederic Weisbecker (1):
Merge commit 'tracing/core' into tracing/kprobes

Masami Hiramatsu (16):
kprobes/x86: Call BUG() when reentering probe into KPROBES_HIT_SS
kprobes/x86-64: Allow to reenter probe on post_handler
kprobes/x86: Fix to add __kprobes to in-kernel fault handing functions
kprobes: Fix to add __kprobes to notify_die
kprobes/x86-64: Fix to move common_interrupt to .kprobes.text
kprobes: Prohibit to probe native_get_debugreg
x86: Allow x86-32 instruction decoder selftest on x86-64
x86: Remove unused config macros from instruction decoder selftest
x86: Add MMX support for instruction decoder
kprobes/x86-32: Move irq-exit functions to kprobes section
x86/ptrace: Fix regs_get_argument_nth() to add correct offset
tracing/kprobes: Fix probe offset to be unsigned
tracing/kprobes: Cleanup kprobe tracer code.
tracing/kprobes: Add event profiling support
tracing/kprobes: Add argument name support
tracing/kprobes: Show event name in trace output

Plus the current set that I'm about to apply, if no problem arises.
I should also merge one more time tip:tracing/core into it because
it has developed another conflicts against it since then.

Ingo, if you are fine with it, I'll send you a pull request
soon.

Thanks,
Frederic.



\
 
 \ /
  Last update: 2009-09-16 06:07    [W:0.843 / U:0.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site