diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-05-04 09:26:16 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-05-04 09:28:29 -0400 |
| commit | 59a094c994a138049b41a44bc29cff9407d51c5b (patch) | |
| tree | d7a8c94b265cb3661f2502dabead334203e8ac92 /arch/x86/kernel/ftrace.c | |
| parent | 4a6d70c9505fef1d8906b1d61db3de5d8ecf9454 (diff) | |
| download | linux-stable-59a094c994a138049b41a44bc29cff9407d51c5b.tar.gz linux-stable-59a094c994a138049b41a44bc29cff9407d51c5b.tar.bz2 linux-stable-59a094c994a138049b41a44bc29cff9407d51c5b.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
| -rw-r--r-- | 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 cf2d03ec1793..4243e8bbdcb1 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> |