Skip to contentSkip to conversation

tracing fixes for -tip

GIT PULL New Frederic Weisbecker 2 participants 4 messages Sep 22, 2009 – Sep 23, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

Ingo,

Please pull these two fixlets that can be found at

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
tracing/urgent

Thanks,
Frederic.

---
The following changes since commit 79fe249c8368be35c9ca05982e80c68e959505e1:
Li Zefan (1):
tracing: Fix failure path in ftrace_regex_open()

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git ..BRANCH.NOT.VERIFIED..

Anton Blanchard (1):
tracing/workqueue: Use %pf in workqueue trace events

Li Hong (1):
tracing: Fix a comment and a trivial format issue in tracepoint.h

 include/linux/tracepoint.h       |    4 ++--
 include/trace/events/workqueue.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
#1 lore raw

PATCH 1/2 tracing: Fix a comment and a trivial format issue in tracepoint.h

From: Li Hong <[email protected]>

Fix the tracepoint documentation path in tracepoints headers and a misaligned tabulation.

Cc Steven Rostedt <[email protected]>
Cc Ingo Molnar <[email protected]>

LKML-Reference: <[email protected]>

---
 include/linux/tracepoint.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/tracepoint.h +2 -2
index 63a3f7a..2aac8a8 100644
@@ -4,7 +4,7 @@
 /*
  * Kernel Tracepoint API.
  *
- * See Documentation/tracepoint.txt.
+ * See Documentation/trace/tracepoints.txt.
  *
  * (C) Copyright 2008 Mathieu Desnoyers <[email protected]>
  *
@@ -36,7 +36,7 @@ struct tracepoint {
 #ifndef DECLARE_TRACE
 
 #define TP_PROTO(args...)	args
-#define TP_ARGS(args...)		args
+#define TP_ARGS(args...)	args
 
 #ifdef CONFIG_TRACEPOINTS
 
Signature · 1 line
1.6.2.3
#2 lore raw

PATCH 2/2 tracing/workqueue: Use %pf in workqueue trace events

In reply to Frederic Weisbecker

From: Anton Blanchard <[email protected]>

Using %pf instead of %pF supresses printing of the function offset which will always be 0 in the case of worklet functions.

Cc KOSAKI Motohiro <[email protected]>
Cc Li Zefan <[email protected]>
Cc Zhaolei <[email protected]>
Cc Lai Jiangshan <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Steven Rostedt <[email protected]>

LKML-Reference: <20090922024033.GB31801@kryten>

---
 include/trace/events/workqueue.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/trace/events/workqueue.h +2 -2
index fcfd9a1..e4612db 100644
@@ -26,7 +26,7 @@ TRACE_EVENT(workqueue_insertion,
 		__entry->func		= work->func;
 	),
 
-	TP_printk("thread=%s:%d func=%pF", __entry->thread_comm,
+	TP_printk("thread=%s:%d func=%pf", __entry->thread_comm,
 		__entry->thread_pid, __entry->func)
 );
 
@@ -48,7 +48,7 @@ TRACE_EVENT(workqueue_execution,
 		__entry->func		= work->func;
 	),
 
-	TP_printk("thread=%s:%d func=%pF", __entry->thread_comm,
+	TP_printk("thread=%s:%d func=%pf", __entry->thread_comm,
 		__entry->thread_pid, __entry->func)
 );
 
Signature · 1 line
1.6.2.3
#3 lore raw
In reply to Frederic Weisbecker
Quoted 6 lines · Frederic Weisbecker

Ingo,

Please pull these two fixlets that can be found at

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
tracing/urgent

Pulled, thanks Frederic!

Ingo