Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Aug 2014 00:33:44 +0000 (17:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Aug 2014 00:33:44 +0000 (17:33 -0700)
commitc23190c0bf1236e1eb5521a8b10d0102fbc1338c
treeeb23225a121fb56a58d69d34e7338bfe81ede644
parentfc335c1b68c68f626f07f1819e57d112d666bbba
parent45ed695ac10a23cb4e60a3e0b68b3f21a8670670
Merge tag 'trace-ipi-tracepoints' of git://git./linux/kernel/git/rostedt/linux-trace

Pull IPI tracepoints for ARM from Steven Rostedt:
 "Nicolas Pitre added generic tracepoints for tracing IPIs and updated
  the arm and arm64 architectures.  It required some minor updates to
  the generic tracepoint system, so it had to wait for me to implement
  them"

* tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ARM64: add IPI tracepoints
  ARM: add IPI tracepoints
  tracepoint: add generic tracepoint definitions for IPI tracing
  tracing: Do not do anything special with tracepoint_string when tracing is disabled
arch/arm64/kernel/smp.c
include/linux/ftrace_event.h