Merge branch 'linus' into perf/core

Merge reason: Pick up the latest perf fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2010-07-21 21:43:03 +02:00
commit 9dcdbf7a33
579 changed files with 6107 additions and 198260 deletions

View file

@ -107,7 +107,7 @@ static int perf_session__add_hist_entry(struct perf_session *self,
goto out_free_syms;
err = 0;
if (symbol_conf.use_callchain) {
err = append_chain(he->callchain, data->callchain, syms);
err = append_chain(he->callchain, data->callchain, syms, data->period);
if (err)
goto out_free_syms;
}