diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-11-18 09:32:36 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-18 09:32:44 +0100 |
| commit | 760a52e80fdf018a9f83a499427923e18e3bd582 (patch) | |
| tree | b37743abb28d9109ce6278b8a896712e713bb25a /tools/perf/tests/tests.h | |
| parent | 0395442ad25853f50d515f4dc00e3475b0df920d (diff) | |
| parent | 47b6308b643302e642ca2a5cb6470926f7e1c428 (diff) | |
| download | linux-760a52e80fdf018a9f83a499427923e18e3bd582.tar.gz linux-760a52e80fdf018a9f83a499427923e18e3bd582.tar.bz2 linux-760a52e80fdf018a9f83a499427923e18e3bd582.zip | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
This brings in some mwifiex changes that further patches will
need to work on top to not cause merge conflicts.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'tools/perf/tests/tests.h')
| -rw-r--r-- | tools/perf/tests/tests.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index ed64790a395f..00e776a87a9c 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -48,6 +48,9 @@ int test__mmap_thread_lookup(void); int test__thread_mg_share(void); int test__hists_output(void); int test__hists_cumulate(void); +int test__switch_tracking(void); +int test__fdarray__filter(void); +int test__fdarray__add(void); #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) #ifdef HAVE_DWARF_UNWIND_SUPPORT |