From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Jan 2013 18:30:49 +0000 (-0800)
Subject: Merge tag 'trace-3.8-rc4-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: submit/tizen_common/20140905.094502~3643
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d26d45253b78ec0a67003eea25bd08fceaa5b78c;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'trace-3.8-rc4-fix' of git://git./linux/kernel/git/rostedt/linux-trace

Pull ftrace fix from Steven Rostedt:
 "Kprobes now uses the function tracer if it can.  That is, if a probe
  is placed on a function mcount/nop location, and the arch supports it,
  instead of adding a breakpoint, kprobes will register a function
  callback as that is much more efficient.

  The function tracer requires to update modules before they run, and
  uses the module notifier to do so.  But if something else in the
  module notifiers registers a kprobe at one of these locations, before
  ftrace can get to it, then the system could fail.

  The function tracer must be initialized early, otherwise module
  notifiers that probe will only work by chance."

* tag 'trace-3.8-rc4-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace: Be first to run code modification on modules
---

d26d45253b78ec0a67003eea25bd08fceaa5b78c