tracing fixes for -tip
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(-)
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.
LKML-Reference: <[email protected]>
--- include/linux/tracepoint.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/tracepoint.h +2 -2
@@ -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
PATCH 2/2 tracing/workqueue: Use %pf in workqueue trace events
In reply to Frederic WeisbeckerFrom: 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.
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
@@ -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
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