Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
Ingo Molnar [Mon, 10 May 2010 06:20:19 +0000 (08:20 +0200)]
1  2 
tools/perf/util/session.c
tools/perf/util/session.h

@@@ -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)
Simple merge