diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-10-24 16:26:37 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-10-24 16:26:37 -0400 |
| commit | db65bcfd9563a7531c3dd46c350565705be1fd84 (patch) | |
| tree | ff7b068472764e36ab02a739917e206dd11d6b46 /tools/perf/builtin-record.c | |
| parent | b47dcbdc5161d3d5756f430191e2840d9b855492 (diff) | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
Merge tag 'v3.18-rc1' into x86/urgent
Reason:
Need to apply audit patch on top of v3.18-rc1.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'tools/perf/builtin-record.c')
| -rw-r--r-- | tools/perf/builtin-record.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 44c6f3d55ce7..2583a9b04317 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | #include "util/parse-options.h" | 14 | #include "util/parse-options.h" |
| 15 | #include "util/parse-events.h" | 15 | #include "util/parse-events.h" |
| 16 | 16 | ||
| 17 | #include "util/callchain.h" | ||
| 18 | #include "util/cgroup.h" | ||
| 17 | #include "util/header.h" | 19 | #include "util/header.h" |
| 18 | #include "util/event.h" | 20 | #include "util/event.h" |
| 19 | #include "util/evlist.h" | 21 | #include "util/evlist.h" |