Re: [PATCH 0/2 v2] [GIT PULL] tracing: updates for 3.5

[Steven Rostedt <rostedt@goodmis.org>]

Hi Peter,

I see you pulled in the patches individually instead of doing a git
pull. But you missed the three patches that were in the previous pull
request (that I only left out to not spam LKML as they were not
changed). Also, without the git pull, it makes my repo out of sync with
tip. As that is usually how I know what was pushed upstream or not.

-- Steve


On Thu, 2012-04-26 at 13:34 -0400, Steven Rostedt wrote:
> Ingo,
> 
> Although only two patches are in this, it really contains the 5 patches
> that I pushed out earlier. As only patch 4/5 changed, instead of
> spamming LKML with the same patches 1-3, I'm only reposting 4 and 5.
> 
> Patch 5 just came along for the ride (same as the previous post).
> 
> Patch 4 (here it's patch 1) was update as per Masami's suggestions (again).
> 
> Thanks!
> 
> -- Steve
> 
> Please pull the latest tip/perf/core-2 tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
> tip/perf/core-2
> 
> Head SHA1: e2017387836dcb963fcbefa767f9f20282349c75
> 
> 
> Steven Rostedt (2):
>       ftrace/x86: Have arch x86_64 use breakpoints instead of stop machine
>       ftrace/x86: Remove the complex ftrace NMI handling code
> 
> ----
>  arch/x86/Kconfig              |    1 -
>  arch/x86/include/asm/ftrace.h |    3 +
>  arch/x86/kernel/ftrace.c      |  511 +++++++++++++++++++++++++++--------------
>  arch/x86/kernel/nmi.c         |   10 +-
>  arch/x86/kernel/traps.c       |    8 +-
>  include/linux/ftrace.h        |    6 +
>  6 files changed, 364 insertions(+), 175 deletions(-)