diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
| commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (patch) | |
| tree | b19210e709de6ee0d22b67ef605a569500cf1a18 /tools/perf/tests/tests.h | |
| parent | cd979883b9ede90643e019f33cb317933eb867b4 (diff) | |
| parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff) | |
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
Diffstat (limited to 'tools/perf/tests/tests.h')
| -rw-r--r-- | tools/perf/tests/tests.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index e0ac713857ba..a24795ca002d 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h | |||
| @@ -40,5 +40,14 @@ int test__code_reading(void); | |||
| 40 | int test__sample_parsing(void); | 40 | int test__sample_parsing(void); |
| 41 | int test__keep_tracking(void); | 41 | int test__keep_tracking(void); |
| 42 | int test__parse_no_sample_id_all(void); | 42 | int test__parse_no_sample_id_all(void); |
| 43 | int test__dwarf_unwind(void); | ||
| 43 | 44 | ||
| 45 | #if defined(__x86_64__) || defined(__i386__) | ||
| 46 | #ifdef HAVE_DWARF_UNWIND_SUPPORT | ||
| 47 | struct thread; | ||
| 48 | struct perf_sample; | ||
| 49 | int test__arch_unwind_sample(struct perf_sample *sample, | ||
| 50 | struct thread *thread); | ||
| 51 | #endif | ||
| 52 | #endif | ||
| 44 | #endif /* TESTS_H */ | 53 | #endif /* TESTS_H */ |