lkml.org 
[lkml]   [2008]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 0/2] ftrace updates for 2.6.28

* Steven Rostedt <rostedt@goodmis.org> wrote:

> The following patches are in:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
>
> branch: devel
>
> Steven Rostedt (2):
> ftrace: disable tracing on resize
> ring-buffer: prevent infinite looping on time stamping
>
> ----
> kernel/trace/ring_buffer.c | 2 +-
> kernel/trace/trace.c | 17 ++++++++++++++++-
> 2 files changed, 17 insertions(+), 2 deletions(-)

pulled into tip/tracing/urgent, thanks Steve!

> The following patches are needed for 2.6.28. The first one solves a
> bug where the resizing of the buffer array was not protected against
> modifications by ftrace.
>
> The second patch solves an issue tha Thomas Gleixner was seeing
> where the tracer would detect the infinite recursion too easily by
> tracing the timer code. This patch prevents the loop from happening
> and still does not lose any trace entries.
>
> The changes caused by these patches are low in risk, but I would
> still like to put them through linux-next before passing them off to
> Linus.
>
> Note, these changes are based against Linus's mainline and not tip.
> Also note that the branch in this tree is "devel" and not
> "tip/devel".

that's OK. I resolved the (trivial) conflict with pending changes in
tip/tracing/ftrace and pushed out a new ftrace integration branch
towards linux-next.

Ingo


\
 
 \ /
  Last update: 2008-11-11 09:27    [W:0.134 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site