diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-19 02:01:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-19 02:01:55 -0400 |
| commit | 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (patch) | |
| tree | fa7f8400ac685fb52e96f64997c7c682fc2aa021 /tools/perf/bench/sched-pipe.c | |
| parent | 7b39f90fabcf9e2af0cd79d0a60440d821e22b56 (diff) | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
Diffstat (limited to 'tools/perf/bench/sched-pipe.c')
| -rw-r--r-- | tools/perf/bench/sched-pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/bench/sched-pipe.c b/tools/perf/bench/sched-pipe.c index 4f77c7c27640..d9ab3ce446ac 100644 --- a/tools/perf/bench/sched-pipe.c +++ b/tools/perf/bench/sched-pipe.c | |||
| @@ -93,7 +93,7 @@ int bench_sched_pipe(int argc, const char **argv, | |||
| 93 | 93 | ||
| 94 | switch (bench_format) { | 94 | switch (bench_format) { |
| 95 | case BENCH_FORMAT_DEFAULT: | 95 | case BENCH_FORMAT_DEFAULT: |
| 96 | printf("# Extecuted %d pipe operations between two tasks\n\n", | 96 | printf("# Executed %d pipe operations between two tasks\n\n", |
| 97 | loops); | 97 | loops); |
| 98 | 98 | ||
| 99 | result_usec = diff.tv_sec * 1000000; | 99 | result_usec = diff.tv_sec * 1000000; |