Skip to content

Commit

Permalink
ftrace/x86: Use asm/kprobes.h instead of linux/kprobes.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed May 4, 2012
1 parent 4a6d70c commit 59a094c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/kernel/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit 59a094c

Please sign in to comment.