[PATCH 0/2] [GIT PULL][v3.0] ftrace: urgent fixes

[Steven Rostedt]

Ingo,

I noticed that tip/perf/urgent wasn't pulled yet. I added it to this
pull request. The first patch is what you reported to me, the second
is a regression that Thomas stumbled upon.

Please pull the latest tip/perf/urgent-2 tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/urgent-2

Head SHA1: f7bc8b61f65726ff98f52e286b28e294499d7a08


Steven Rostedt (2):
      ftrace: Fix warning when CONFIG_FUNCTION_TRACER is not defined
      ftrace: Fix regression where ftrace breaks when modules are loaded

----
 include/linux/ftrace.h |    4 ++--
 kernel/trace/ftrace.c  |   30 ++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/