From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
Frederic Weisbecker <fweisbec@gmail.com>,
Jason Baron <jbaron@redhat.com>
Subject: [PATCH 0/6] [GIT PULL][v2.6.40] tracing: updates and jump label rebase
Date: Mon, 04 Apr 2011 15:16:54 -0400 [thread overview]
Message-ID: <20110404191654.006849945@goodmis.org> (raw)
Hi Ingo,
This includes minor updates to ftrace as well as the patchset
for jump labels. I took out the debug printk patch that had caused
earlier conflicts. We can add that one later.
Please pull the latest tip/perf/core tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/core
Jan Glauber (1):
jump label: Add s390 support
Jason Baron (2):
jump label: Introduce static_branch() interface
jump label: Add _ASM_ALIGN for x86 and x86_64
Jiri Olsa (1):
tracing: Avoid soft lockup in trace_pipe
Steven Rostedt (2):
tracing: Convert trace_printk() formats for module to const char *
tracing: Print trace_bprintk() formats for modules too
----
arch/mips/include/asm/jump_label.h | 22 +-
arch/s390/Kconfig | 1 +
arch/s390/include/asm/jump_label.h | 37 +++
arch/s390/kernel/Makefile | 2 +-
arch/s390/kernel/jump_label.c | 59 ++++
arch/sparc/include/asm/jump_label.h | 25 +-
arch/x86/include/asm/alternative.h | 3 +-
arch/x86/include/asm/jump_label.h | 27 +-
arch/x86/kernel/alternative.c | 2 +-
arch/x86/kernel/module.c | 1 +
include/asm-generic/vmlinux.lds.h | 14 +-
include/linux/dynamic_debug.h | 2 -
include/linux/jump_label.h | 89 ++++---
include/linux/jump_label_ref.h | 44 ---
include/linux/perf_event.h | 26 +-
include/linux/tracepoint.h | 22 +-
kernel/jump_label.c | 539 ++++++++++++++---------------------
kernel/perf_event.c | 4 +-
kernel/trace/trace.c | 15 +-
kernel/trace/trace_output.c | 3 +
kernel/trace/trace_printk.c | 120 +++++++-
kernel/tracepoint.c | 23 +-
22 files changed, 578 insertions(+), 502 deletions(-)
next reply other threads:[~2011-04-04 19:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-04 19:16 Steven Rostedt [this message]
2011-04-04 19:16 ` [PATCH 1/6] tracing: Convert trace_printk() formats for module to const char * Steven Rostedt
2011-04-04 19:16 ` [PATCH 2/6] tracing: Print trace_bprintk() formats for modules too Steven Rostedt
2011-04-04 19:16 ` [PATCH 3/6] tracing: Avoid soft lockup in trace_pipe Steven Rostedt
2011-04-04 19:16 ` [PATCH 4/6] jump label: Introduce static_branch() interface Steven Rostedt
2011-04-04 19:16 ` [PATCH 5/6] jump label: Add _ASM_ALIGN for x86 and x86_64 Steven Rostedt
2011-04-04 19:17 ` [PATCH 6/6] jump label: Add s390 support Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2011-04-20 15:58 [PATCH 0/6] [GIT PULL][v2.6.40] tracing: updates and jump label rebase Steven Rostedt
2011-04-26 13:19 ` Steven Rostedt
2011-04-27 11:12 ` Ingo Molnar
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=20110404191654.006849945@goodmis.org \
--to=rostedt@goodmis.org \
--cc=fweisbec@gmail.com \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.kernel.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