* [PATCH 0/2] tracing: a couple minor for-next fixes
@ 2013-11-11 5:03 Tom Zanussi
2013-11-11 5:03 ` [PATCH 1/2] tracing: Add __rcu to enter/exit_syscall_files Tom Zanussi
2013-11-11 5:03 ` [PATCH 2/2] tracing: Remove redundant destroy_call_preds() call Tom Zanussi
0 siblings, 2 replies; 3+ messages in thread
From: Tom Zanussi @ 2013-11-11 5:03 UTC (permalink / raw)
To: rostedt; +Cc: linux-kernel, Tom Zanussi
This patchset fixes a couple sparse warnings reported by the 'kbuild
test robot' and removes a redundant function call noticed by Steve
Rostedt.
The following changes since commit 20b72e76c42bc4f0dd091f9faee542ea45ad6b5e:
Merge branch 'trace/ftrace/core' into trace/for-next (2013-11-06 22:58:52 -0500)
are available in the git repository at:
git://git.yoctoproject.org/linux-yocto-contrib.git tzanussi/tracing-next-fixes
http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-contrib/log/?h=tzanussi/tracing-next-fixes
Tom Zanussi (2):
tracing: Add __rcu to enter/exit_syscall_files
tracing: Remove redundant destroy_call_preds() call
kernel/trace/trace.h | 4 ++--
kernel/trace/trace_events.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] tracing: Add __rcu to enter/exit_syscall_files
2013-11-11 5:03 [PATCH 0/2] tracing: a couple minor for-next fixes Tom Zanussi
@ 2013-11-11 5:03 ` Tom Zanussi
2013-11-11 5:03 ` [PATCH 2/2] tracing: Remove redundant destroy_call_preds() call Tom Zanussi
1 sibling, 0 replies; 3+ messages in thread
From: Tom Zanussi @ 2013-11-11 5:03 UTC (permalink / raw)
To: rostedt; +Cc: linux-kernel, Tom Zanussi
Add __rcu annotation to the contents of enter/exit_syscall_files to
signify that they're protected by rcu and to silence the following
sparse warnings when CONFIG_SPARSE_RCU_POINTER=y:
kernel/trace/trace_syscalls.c:320:23: error: incompatible types in
comparison expression (different address spaces)
kernel/trace/trace_syscalls.c:368:23: error: incompatible types in
comparison expression (different address spaces)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
---
kernel/trace/trace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 11a04d6..7ca1993 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -192,8 +192,8 @@ struct trace_array {
#ifdef CONFIG_FTRACE_SYSCALLS
int sys_refcount_enter;
int sys_refcount_exit;
- struct ftrace_event_file *enter_syscall_files[NR_syscalls];
- struct ftrace_event_file *exit_syscall_files[NR_syscalls];
+ struct ftrace_event_file __rcu *enter_syscall_files[NR_syscalls];
+ struct ftrace_event_file __rcu *exit_syscall_files[NR_syscalls];
#endif
int stop_count;
int clock_id;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] tracing: Remove redundant destroy_call_preds() call
2013-11-11 5:03 [PATCH 0/2] tracing: a couple minor for-next fixes Tom Zanussi
2013-11-11 5:03 ` [PATCH 1/2] tracing: Add __rcu to enter/exit_syscall_files Tom Zanussi
@ 2013-11-11 5:03 ` Tom Zanussi
1 sibling, 0 replies; 3+ messages in thread
From: Tom Zanussi @ 2013-11-11 5:03 UTC (permalink / raw)
To: rostedt; +Cc: linux-kernel, Tom Zanussi
Before calling destroy_call_preds(), __trace_remove_event_call() calls
event_remove(), which ends up calling destroy_call_preds() (via
destroy_preds()) if USE_CALL_FILTER is set. That means the second
call is redundant and can be removed.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Reported-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_events.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index f919a2e..a14f6a1 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1708,7 +1708,6 @@ static void __trace_remove_event_call(struct ftrace_event_call *call)
{
event_remove(call);
trace_destroy_fields(call);
- destroy_call_preds(call);
}
static int probe_remove_event_call(struct ftrace_event_call *call)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-11 5:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-11 5:03 [PATCH 0/2] tracing: a couple minor for-next fixes Tom Zanussi
2013-11-11 5:03 ` [PATCH 1/2] tracing: Add __rcu to enter/exit_syscall_files Tom Zanussi
2013-11-11 5:03 ` [PATCH 2/2] tracing: Remove redundant destroy_call_preds() call Tom Zanussi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox