lkml.org 
[lkml]   [2011]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subject[PATCH 0/6] [GIT PULL][v2.6.40] tracing: updates and jump label rebase

Ingo,

[ Resend, as due to a cut and paste error, Ingo's and Andrew's email
was chopped off the Cc list ]

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(-)


\
 
 \ /
  Last update: 2011-04-20 18:15    [W:0.091 / U:0.240 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site