diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-17 04:16:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-17 04:17:47 -0500 |
| commit | a7b63425a41cd6a8d50f76fef0660c5110f97e91 (patch) | |
| tree | be17ee121f1c8814d8d39c9f3e0205d9397fab54 /tools/perf/util/debug.h | |
| parent | 35039eb6b199749943547c8572be6604edf00229 (diff) | |
| parent | 3726cc75e581c157202da93bb2333cce25c15c98 (diff) | |
Merge branch 'perf/core' into perf/probes
Resolved merge conflict in tools/perf/Makefile
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/debug.h')
| -rw-r--r-- | tools/perf/util/debug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h index e8b18a1f87a4..c6c24c522dea 100644 --- a/tools/perf/util/debug.h +++ b/tools/perf/util/debug.h | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | #ifndef __PERF_DEBUG_H | 2 | #ifndef __PERF_DEBUG_H |
| 3 | #define __PERF_DEBUG_H | 3 | #define __PERF_DEBUG_H |
| 4 | 4 | ||
| 5 | #include "event.h" | ||
| 6 | |||
| 5 | extern int verbose; | 7 | extern int verbose; |
| 6 | extern int dump_trace; | 8 | extern int dump_trace; |
| 7 | 9 | ||