diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 09:28:39 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 09:28:39 +0100 |
commit | 15e99b13b44bd969b085f866fb4d5dc72f65d2d0 (patch) | |
tree | 6af5d0b1c225400d2c1df9951d6b8d85b6329f8f /tools/perf/util/c++/clang.cpp | |
parent | 81534d5fa973fc10a48c245c08688e61ffe41366 (diff) | |
parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
download | lwn-15e99b13b44bd969b085f866fb4d5dc72f65d2d0.tar.gz lwn-15e99b13b44bd969b085f866fb4d5dc72f65d2d0.zip |
Merge 5.0-rc6 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/util/c++/clang.cpp')
-rw-r--r-- | tools/perf/util/c++/clang.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp index 89512504551b..39c0004f2886 100644 --- a/tools/perf/util/c++/clang.cpp +++ b/tools/perf/util/c++/clang.cpp @@ -160,7 +160,7 @@ getBPFObjectFromModule(llvm::Module *Module) } PM.run(*Module); - return std::move(Buffer); + return Buffer; } } |