lkml.org 
[lkml]   [2009]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subject[PATCH v2 0/7] ftrace: updates for tip
Ingo,

This is still based off of tip/master since it is not all focused
on ftrace (has NMI generic code). I'll let you cherry pick and
figure out what goes where.

I tried to cherry pick them into tracing/ftrace and hit a bit of conflicts.
Next time, I'll just develop against tip/tracing/ftrace or
tip/tracing/core.

Changes since the first version:

- Added Mathieu Desnoyers credit in the in_nmi change log.

- Included the original ring buffer changes which these are
based on and that I do not see in tip/master.

- Added a comment fix patch by Wenji.

The following patches are in:

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

branch: tip/devel


Steven Rostedt (6):
ring-buffer: add NMI protection for spinlocks
ring-buffer: allow tracing_off to be used in core kernel code
ftrace, x86: rename in_nmi variable
nmi: add generic nmi tracking state
ftrace: change function graph tracer to use new in_nmi
ring-buffer: use generic version of in_nmi

Wenji Huang (1):
trace: trivial fixes in comment typos.

----
arch/x86/Kconfig | 1 +
arch/x86/kernel/ftrace.c | 35 ++++++++---------------------------
include/linux/ftrace.h | 2 +-
include/linux/ftrace_irq.h | 2 +-
include/linux/hardirq.h | 15 +++++++++++++++
include/linux/ring_buffer.h | 9 +++++++++
kernel/trace/Kconfig | 8 ++++++++
kernel/trace/ftrace.c | 6 +++---
kernel/trace/ring_buffer.c | 31 +++++++++++++++++++++++++++++--
kernel/trace/trace.h | 6 +++---
10 files changed, 78 insertions(+), 37 deletions(-)
--


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