Peter, I've respun the local_irq_*_nmi() interface addition, sparc64 implementation, and trace/sched_clock annotations against Linus's tree. I've tested all of the tracers in various different configurations on sparc64 and I haven't triggered any of the bug checks or crashes yet so it should be good. It can also be pulled from: master.kernel.org:/pub/scm/linux/kernel/git/davem/trace-2.6.git And it would be nice to see this upstream soon so I can build upon it :-) You'll need to add the perf locking fix annotation to the -tip tree as per you initial patch set, that didn't apply to mainline so I didn't put it in here. Thanks! -------------------- The following changes since commit 0eddb519b9127c73d53db4bf3ec1d45b13f844d1: Linus Torvalds (1): Merge branch 'for-linus' of git://git.kernel.org/.../roland/infiniband are available in the git repository at: master.kernel.org:/pub/scm/linux/kernel/git/davem/trace-2.6.git master David S. Miller (2): sparc64: Implement local_irq_save_nmi() override. tracing: Use local_irq_{save,restore}_nmi() in tracers. Peter Zijlstra (2): kernel: local_irq_{save,restore}_nmi() sched: Use local_irq_save_nmi() in cpu_clock() arch/sparc/include/asm/irqflags_64.h | 29 +++++++++++++++++++ include/linux/irqflags.h | 51 ++++++++++++++++++++++++++++++++-- kernel/lockdep.c | 7 ++++ kernel/sched_clock.c | 4 +- kernel/trace/ftrace.c | 8 ++-- kernel/trace/trace_functions.c | 8 ++-- kernel/trace/trace_functions_graph.c | 8 ++-- kernel/trace/trace_irqsoff.c | 8 +++++ kernel/trace/trace_sched_wakeup.c | 4 +- kernel/trace/trace_stack.c | 4 +- 10 files changed, 110 insertions(+), 21 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html