From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 23 Oct 2013 07:50:33 +0000 (+0200)
Subject: Merge branch 'perf/urgent'
X-Git-Tag: next-20131024~43^2~14
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=a1595789bdf80586b781afa9c04a2e91812d322f;p=karo-tx-linux.git

Merge branch 'perf/urgent'
---

a1595789bdf80586b781afa9c04a2e91812d322f
diff --cc tools/perf/util/evsel.c
index ec0cc1e21c62,9f1ef9bee2d0..3a334f001997
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@@ -678,12 -678,8 +678,11 @@@ void perf_evsel__config(struct perf_evs
  		attr->sample_type	|= PERF_SAMPLE_WEIGHT;
  
  	attr->mmap  = track;
- 	attr->mmap2 = track && !perf_missing_features.mmap2;
  	attr->comm  = track;
  
 +	if (opts->sample_transaction)
 +		attr->sample_type	|= PERF_SAMPLE_TRANSACTION;
 +
  	/*
  	 * XXX see the function comment above
  	 *