From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 10 May 2010 06:20:19 +0000 (+0200)
Subject: Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f0ac7183f4d270bd9ce511254ba5d931d4f29c9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'perf/test' of git://git./linux/kernel/git/frederic/random-tracing into perf/core
---

1f0ac7183f4d270bd9ce511254ba5d931d4f29c9
diff --cc tools/perf/util/session.c
index 71bc608e0ec6,00ab298bbb4b..c088d8f9b51c
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@@ -98,9 -98,7 +98,8 @@@ struct perf_session *perf_session__new(
  	self->unknown_events = 0;
  	self->machines = RB_ROOT;
  	self->repipe = repipe;
- 	self->ordered_samples.flush_limit = ULLONG_MAX;
  	INIT_LIST_HEAD(&self->ordered_samples.samples_head);
 +	machine__init(&self->host_machine, "", HOST_KERNEL_ID);
  
  	if (mode == O_RDONLY) {
  		if (perf_session__open(self, force) < 0)