From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Feb 2009 09:35:12 +0000 (+0100)
Subject: Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.30-rc1~2^2~124
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=44b0635481437140b0e29d6023f05e805d5e7620;p=~shefty%2Frdma-dev.git

Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Conflicts:
	kernel/trace/trace_hw_branches.c
---

44b0635481437140b0e29d6023f05e805d5e7620
diff --cc kernel/trace/trace_hw_branches.c
index ca4bbcfb9e2,549238a9b13..e3e7db61c06
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@@ -193,10 -193,11 +193,11 @@@ void trace_hw_branch(u64 from, u64 to
  	if (!event)
  		goto out;
  	entry	= ring_buffer_event_data(event);
- 	entry->ent.cpu = cpu;
+ 	tracing_generic_entry_update(&entry->ent, 0, from);
+ 	entry->ent.type = TRACE_HW_BRANCHES;
  	entry->from = from;
  	entry->to   = to;
 -	ring_buffer_unlock_commit(tr->buffer, event, irq2);
 +	trace_buffer_unlock_commit(tr, event, 0, 0);
  
   out:
  	atomic_dec(&tr->data[cpu]->disabled);