TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.34-rc2' into perf/core

Browse Source 
Merge reason: Pick up latest perf fixes from upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-03-22 18:46:57 +01:00
parent 40b7e05e17 220bf991b0
commit d2f1e15b66
2108 changed files with 117443 additions and 54684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/perf.c
View File

@@ -449,7 +449,7 @@ int main(int argc, const char **argv)
/*
* We use PATH to find perf commands, but we prepend some higher
* precidence paths: the "--exec-path" option, the PERF_EXEC_PATH
* precedence paths: the "--exec-path" option, the PERF_EXEC_PATH
* environment, and the $(perfexecdir) from the Makefile at build
* time.
*/

2
tools/perf/util/hist.c
View File

@@ -321,7 +321,7 @@ static size_t __callchain__fprintf_graph(FILE *fp, struct callchain_node *self,
new_depth_mask &= ~(1 << (depth - 1));
/*
* But we keep the older depth mask for the line seperator
* But we keep the older depth mask for the line separator
* to keep the level link until we reach the last child
*/
ret += ipchain__fprintf_graph_line(fp, depth, depth_mask,