[PATCH][GIT PULL]

[Steven Rostedt <rostedt@goodmis.org>]

Ingo,

This is based on top of tip/perf/core-3, and fixes the compile error
that you saw with CONFIG_KPROBES disabled.

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

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/core-4

Head SHA1: 59a094c994a138049b41a44bc29cff9407d51c5b


Steven Rostedt (1):
      ftrace/x86: Use asm/kprobes.h instead of linux/kprobes.h

----
 arch/x86/kernel/ftrace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit 59a094c994a138049b41a44bc29cff9407d51c5b
Author: Steven Rostedt <srostedt@redhat.com>
Date:   Fri May 4 09:26:16 2012 -0400

    ftrace/x86: Use asm/kprobes.h instead of linux/kprobes.h
    
    If CONFIG_KPROBES is not set, then linux/kprobes.h will not include
    asm/kprobes.h needed by x86/ftrace.c for the BREAKPOINT macro.
    
    The x86/ftrace.c file should just include asm/kprobes.h as it does not
    need the rest of kprobes.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index cf2d03e..4243e8b 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -20,11 +20,11 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/module.h>
-#include <linux/kprobes.h>
 
 #include <trace/syscall.h>
 
 #include <asm/cacheflush.h>
+#include <asm/kprobes.h>
 #include <asm/ftrace.h>
 #include <asm/nops.h>