kallsyms.h was included by ftrace.h for KSYM_NAME_LEN, but that usage was removed by commit 3f5ec13696f [tracing/fastboot: move boot tracer structs and funcs into their own header].
Remove kallsyms.h and have users relying on ftrace.h to include it for them include it explicitly. Signed-off-by: Tom Zanussi <tom.zanu...@linux.intel.com> --- include/linux/ftrace.h | 1 - kernel/trace/trace_kprobe.c | 1 + kernel/trace/trace_output.c | 1 + kernel/trace/trace_syscalls.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 1da6029..8554dd5 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -7,7 +7,6 @@ #define _LINUX_FTRACE_H #include <linux/trace_clock.h> -#include <linux/kallsyms.h> #include <linux/linkage.h> #include <linux/bitops.h> #include <linux/ptrace.h> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index b7d0cdd..afdabd0 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -18,6 +18,7 @@ */ #include <linux/module.h> +#include <linux/kallsyms.h> #include <linux/uaccess.h> #include "trace_probe.h" diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index dfab253..6747d85 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -6,6 +6,7 @@ */ #include <linux/module.h> +#include <linux/kallsyms.h> #include <linux/mutex.h> #include <linux/ftrace.h> diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 7d567a4..e9bf9c6 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -4,6 +4,7 @@ #include <linux/slab.h> #include <linux/kernel.h> #include <linux/module.h> /* for MODULE_NAME_LEN via KSYM_SYMBOL_LEN */ +#include <linux/kallsyms.h> #include <linux/ftrace.h> #include <linux/perf_event.h> #include <asm/syscall.h> -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
