]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit70e1a5a504e75772883dfa983ef078ae40468594
treeeb23225a121fb56a58d69d34e7338bfe81ede644
parent761f65f0a6872dca893b73c933f09213dce32e72
parent439fa3a118540d14d667c13fb6f049eb704c95de
Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/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