diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /tools/perf/util/run-command.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'tools/perf/util/run-command.h')
| -rw-r--r-- | tools/perf/util/run-command.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/run-command.h b/tools/perf/util/run-command.h index cc1837deba88..d79028727ce2 100644 --- a/tools/perf/util/run-command.h +++ b/tools/perf/util/run-command.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef RUN_COMMAND_H | 1 | #ifndef __PERF_RUN_COMMAND_H |
| 2 | #define RUN_COMMAND_H | 2 | #define __PERF_RUN_COMMAND_H |
| 3 | 3 | ||
| 4 | enum { | 4 | enum { |
| 5 | ERR_RUN_COMMAND_FORK = 10000, | 5 | ERR_RUN_COMMAND_FORK = 10000, |
| @@ -85,4 +85,4 @@ struct async { | |||
| 85 | int start_async(struct async *async); | 85 | int start_async(struct async *async); |
| 86 | int finish_async(struct async *async); | 86 | int finish_async(struct async *async); |
| 87 | 87 | ||
| 88 | #endif | 88 | #endif /* __PERF_RUN_COMMAND_H */ |