From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: rostedt@goodmis.org, pebolle@tiscali.nl, rientjes@google.com,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH v3 1/7] tracing: Remove kallsyms.h include from linux/ftrace.h
Date: Wed, 8 Jul 2015 17:35:09 -0500 [thread overview]
Message-ID: <4be17df33138d9fc3cdaf6859ddf8782fb1f4bbb.1436387183.git.tom.zanussi@linux.intel.com> (raw)
In-Reply-To: <cover.1436387183.git.tom.zanussi@linux.intel.com>
In-Reply-To: <cover.1436387183.git.tom.zanussi@linux.intel.com>
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.zanussi@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
next prev parent reply other threads:[~2015-07-08 22:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 22:35 [PATCH v3 0/7] kallsyms header cleanup Tom Zanussi
2015-07-08 22:35 ` Tom Zanussi [this message]
2015-07-08 22:35 ` [PATCH v3 2/7] kallsyms: Add module.h include Tom Zanussi
2015-07-08 22:35 ` [PATCH v3 3/7] tracing: Remove redundant module.h includes Tom Zanussi
2015-07-08 22:35 ` [PATCH v3 4/7] lib: " Tom Zanussi
2015-07-08 22:35 ` [PATCH v3 5/7] fnic: " Tom Zanussi
2015-07-08 22:35 ` [PATCH v3 6/7] slub: " Tom Zanussi
2015-07-08 22:35 ` [PATCH v3 7/7] tracing: Remove unnecessary kallsyms.h and " Tom Zanussi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4be17df33138d9fc3cdaf6859ddf8782fb1f4bbb.1436387183.git.tom.zanussi@linux.intel.com \
--to=tom.zanussi@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pebolle@tiscali.nl \
--cc=rientjes@google.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®