diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /tools/perf/bench/sched-pipe.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.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 d9ab3ce446ac..0c7454f8b8a9 100644 --- a/tools/perf/bench/sched-pipe.c +++ b/tools/perf/bench/sched-pipe.c | |||
| @@ -55,7 +55,7 @@ int bench_sched_pipe(int argc, const char **argv, | |||
| 55 | * discarding returned value of read(), write() | 55 | * discarding returned value of read(), write() |
| 56 | * causes error in building environment for perf | 56 | * causes error in building environment for perf |
| 57 | */ | 57 | */ |
| 58 | int ret, wait_stat; | 58 | int __used ret, wait_stat; |
| 59 | pid_t pid, retpid; | 59 | pid_t pid, retpid; |
| 60 | 60 | ||
| 61 | argc = parse_options(argc, argv, options, | 61 | argc = parse_options(argc, argv, options, |