diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 09:13:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 09:13:26 +0200 |
| commit | 84b13fd596522db47f9545d5124c30cc00dfdf5a (patch) | |
| tree | c1f51b8fe43a59fb56ea43a18da88c0d0812dd7d /tools/perf/scripts/python/bin/syscall-counts-record | |
| parent | f92128193094c288bc315db1694fafeaeb7ee1d0 (diff) | |
| parent | a0cccc2e8e9fb16cbed3a117b30e3fbac3092ee3 (diff) | |
Merge branch 'perf/live' into perf/core
Conflicts:
tools/perf/builtin-record.c
Merge reason: add the live tracing feature, resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/scripts/python/bin/syscall-counts-record')
| -rw-r--r-- | tools/perf/scripts/python/bin/syscall-counts-record | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/bin/syscall-counts-record b/tools/perf/scripts/python/bin/syscall-counts-record index 45a8c50359d..27ccffa26ab 100644 --- a/tools/perf/scripts/python/bin/syscall-counts-record +++ b/tools/perf/scripts/python/bin/syscall-counts-record @@ -1,2 +1,2 @@ #!/bin/bash -perf record -c 1 -f -a -M -R -e raw_syscalls:sys_enter +perf record -c 1 -f -a -M -R -e raw_syscalls:sys_enter $@ |