diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-05-23 11:05:26 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-05-23 11:05:59 +0200 |
| commit | dd8070bff204a67fcb6585f18047841a895b68d7 (patch) | |
| tree | cce17d4b8eb8987194beb40498c8f83e74d6799f /tools/perf/util/c++/clang-test.cpp | |
| parent | f3a7ca64587f58686d4e2e894e9abbfbc9dffb25 (diff) | |
| parent | 1fe8c06c4a0d3b589f076cd00c25082840f10423 (diff) | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Bring in net-next which had pulled in net, so I have the changes
from mac80211 and can apply a patch that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'tools/perf/util/c++/clang-test.cpp')
| -rw-r--r-- | tools/perf/util/c++/clang-test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/c++/clang-test.cpp b/tools/perf/util/c++/clang-test.cpp index a4014d786676..7b042a5ebc68 100644 --- a/tools/perf/util/c++/clang-test.cpp +++ b/tools/perf/util/c++/clang-test.cpp @@ -41,7 +41,7 @@ int test__clang_to_IR(void) if (!M) return -1; for (llvm::Function& F : *M) - if (F.getName() == "bpf_func__SyS_epoll_wait") + if (F.getName() == "bpf_func__SyS_epoll_pwait") return 0; return -1; } |