diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
| commit | c602c65b2f81d14456771d1e3f15d1381f4b7efa (patch) | |
| tree | f1f833c8dd6c1519eeb101be32f7fe54a9605af5 /tools/perf/util/run-command.c | |
| parent | 3834f47291df475be3f0f0fb7ccaa098967cc054 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into sfi-release
Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools/perf/util/run-command.c')
| -rw-r--r-- | tools/perf/util/run-command.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/run-command.c b/tools/perf/util/run-command.c index a3935343091a..2b615acf94d7 100644 --- a/tools/perf/util/run-command.c +++ b/tools/perf/util/run-command.c @@ -262,7 +262,7 @@ int run_hook(const char *index_file, const char *name, ...) { struct child_process hook; const char **argv = NULL, *env[2]; - char index[PATH_MAX]; + char idx[PATH_MAX]; va_list args; int ret; size_t i = 0, alloc = 0; @@ -284,8 +284,8 @@ int run_hook(const char *index_file, const char *name, ...) hook.no_stdin = 1; hook.stdout_to_stderr = 1; if (index_file) { - snprintf(index, sizeof(index), "PERF_INDEX_FILE=%s", index_file); - env[0] = index; + snprintf(idx, sizeof(idx), "PERF_INDEX_FILE=%s", index_file); + env[0] = idx; env[1] = NULL; hook.env = env; } |