Prev: DMAENGINE: ste_dma40: fixed lli_max=1 issue
Next: Additional fix : (was [v2]printk: fix delayed messages from CPU hotplug events)
From: Ingo Molnar on 29 Jun 2010 04:50

* Steven Rostedt <rostedt(a)goodmis.org> wrote:

> Ingo,
>
> I pushed some of these to you before, but you wanted to wait
> till after the merge window to pull them.
>
> The last patch is the full fix for the perf kprobe regression. But
> since it was too big of a change for the -rc release we did
> a quick fix. This reverts that change back to the true fix for
> 2.6.36.
>
> Please pull the latest tip/perf/core tree, which can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/perf/core
>
>
> Chase Douglas (1):
> tracing/function-graph: Use correct string size for snprintf
>
> Li Zefan (7):
> tracing: Use a global field list for all syscall exit events
> tracing: Don't allocate common fields for every trace events
> tracing: Convert some timer events to DEFINE_EVENT
> tracing: Convert more sched events to DEFINE_EVENT
> tracing: Remove test of NULL define_fields callback
> tracing: Remove redundant raw_init callbacks
> tracing: Remove open-coded __trace_add_event_call()
>
> Steven Rostedt (1):
> tracing: Use class->reg() for all registering of events
>
> ----
> include/linux/ftrace_event.h | 3 +
> include/linux/syscalls.h | 2 -
> include/trace/events/sched.h | 32 +----
> include/trace/events/timer.h | 80 ++++------
> include/trace/ftrace.h | 2 +
> include/trace/syscall.h | 1 -
> kernel/trace/trace.h | 2 +
> kernel/trace/trace_event_perf.c | 19 +--
> kernel/trace/trace_events.c | 264 +++++++++++++++++-----------------
> kernel/trace/trace_events_filter.c | 27 ++--
> kernel/trace/trace_export.c | 8 +-
> kernel/trace/trace_functions_graph.c | 3 +-
> kernel/trace/trace_kprobe.c | 10 +--
> kernel/trace/trace_syscalls.c | 7 +-
> 14 files changed, 203 insertions(+), 257 deletions(-)

Pulled, thanks a lot Steve!

Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: DMAENGINE: ste_dma40: fixed lli_max=1 issue
Next: Additional fix : (was [v2]printk: fix delayed messages from CPU hotplug events)