diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-17 19:09:09 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-17 19:12:33 -0400 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /samples/trace_events/trace-events-sample.h | |
| parent | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (diff) | |
| parent | f39cdf25bf77219676ec5360980ac40b1a7e144a (diff) | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'samples/trace_events/trace-events-sample.h')
| -rw-r--r-- | samples/trace_events/trace-events-sample.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/trace_events/trace-events-sample.h b/samples/trace_events/trace-events-sample.h index f24ae370e514..6af373236d73 100644 --- a/samples/trace_events/trace-events-sample.h +++ b/samples/trace_events/trace-events-sample.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * If TRACE_SYSTEM is defined, that will be the directory created | 2 | * If TRACE_SYSTEM is defined, that will be the directory created |
| 3 | * in the ftrace directory under /debugfs/tracing/events/<system> | 3 | * in the ftrace directory under /sys/kernel/debug/tracing/events/<system> |
| 4 | * | 4 | * |
| 5 | * The define_trace.h below will also look for a file name of | 5 | * The define_trace.h below will also look for a file name of |
| 6 | * TRACE_SYSTEM.h where TRACE_SYSTEM is what is defined here. | 6 | * TRACE_SYSTEM.h where TRACE_SYSTEM is what is defined here. |