Commit-ID: 59a094c994a138049b41a44bc29cff9407d51c5b Gitweb: http://git.kernel.org/tip/59a094c994a138049b41a44bc29cff9407d51c5b Author: Steven Rostedt <srostedt@xxxxxxxxxx> AuthorDate: Fri, 4 May 2012 09:26:16 -0400 Committer: Steven Rostedt <rostedt@xxxxxxxxxxx> CommitDate: Fri, 4 May 2012 09:28:29 -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@xxxxxxx> Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> --- arch/x86/kernel/ftrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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> -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|