• Linus Torvalds's avatar
    Merge tag 'trace-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 7eb69529
    Linus Torvalds authored
    Pull tracing updates from Steven Rostedt:
     "Not much changes for the 3.12 merge window.  The major tracing changes
      are still in flux, and will have to wait for 3.13.
      The changes for 3.12 are mostly clean ups and minor fixes.
      H Peter Anvin added a check to x86_32 static function tracing that
      helps a small segment of the kernel community.
      Oleg Nesterov had a few changes from 3.11, but were mostly clean ups
      and not worth pushing in the -rc time frame.
      Li Zefan had small clean up with annotating a raw_init with __init.
      I fixed a slight race in updating function callbacks, but the race is
      so small and the bug that happens when it occurs is so minor it's not
      even worth pushing to stable.
      The only real enhancement is from Alexander Z Lam that made the
      tracing_cpumask work for trace buffer instances, instead of them all
      sharing a global cpumask"
    * tag 'trace-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      ftrace/rcu: Do not trace debug_lockdep_rcu_enabled()
      x86-32, ftrace: Fix static ftrace when early microcode is enabled
      ftrace: Fix a slight race in modifying what function callback gets traced
      tracing: Make tracing_cpumask available for all instances
      tracing: Kill the !CONFIG_MODULES code in trace_events.c
      tracing: Don't pass file_operations array to event_create_dir()
      tracing: Kill trace_create_file_ops() and friends
      tracing/syscalls: Annotate raw_init function with __init
rcupdate.c 10.1 KB