On Mon, Sep 21, 2015 at 06:23:21PM -0300, Arnaldo Carvalho de Melo wrote:
> From: Wang Nan <[email protected]>
> 
> By adding libbpf into perf's Makefile, this patch enables perf to build
> libbpf during building if libelf is found and neither NO_LIBELF nor
> NO_LIBBPF is set. The newly introduced code is similar to libapi and
> libtraceevent building in Makefile.perf.
> 
> MANIFEST is also updated for 'make perf-*-src-pkg'.
> 
> Append make_no_libbpf to tools/perf/tests/make.
> 
> 'bpf' feature check is appended into default FEATURE_TESTS and
> FEATURE_DISPLAY, so perf will check API version of bpf in
> /path/to/kernel/include/uapi/linux/bpf.h. Which should not fail except
> when we are trying to port this code to an old kernel.
> 
> Error messages are also updated to notify users about the disable of BPF
> support of 'perf record' if libelf is missed or BPF API check failed.
> 
> tools/lib/bpf is added into TAG_FOLDERS to allow us to navigate on
> libbpf files when working on perf using tools/perf/tags.
> 
> Signed-off-by: Wang Nan <[email protected]>
> Acked-by: Alexei Starovoitov <[email protected]>
> Cc: Brendan Gregg <[email protected]>
> Cc: Daniel Borkmann <[email protected]>
> Cc: David Ahern <[email protected]>
> Cc: He Kuang <[email protected]>
> Cc: Jiri Olsa <[email protected]>
> Cc: Kaixu Xia <[email protected]>
> Cc: Masami Hiramatsu <[email protected]>
> Cc: Namhyung Kim <[email protected]>
> Cc: Paul Mackerras <[email protected]>
> Cc: Peter Zijlstra <[email protected]>
> Cc: Zefan Li <[email protected]>
> Cc: [email protected]
> Link: 
> http://lkml.kernel.org/r/[email protected]
> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
> ---
>  tools/build/Makefile.feature |  6 ++++--
>  tools/perf/MANIFEST          |  3 +++
>  tools/perf/Makefile.perf     | 19 +++++++++++++++++--
>  tools/perf/config/Makefile   | 19 ++++++++++++++++++-
>  tools/perf/tests/make        |  4 +++-
>  5 files changed, 45 insertions(+), 6 deletions(-)
> 

missing doc hunk in Makefile.perf

jirka


---
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 8af786f458df..bb949c9e818a 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -75,6 +75,8 @@ include config/utilities.mak
 # Define NO_LZMA if you do not want to support compressed (xz) kernel modules
 #
 # Define NO_AUXTRACE if you do not want AUX area tracing support
+#
+# Define NO_BPF if you do not want BPF support
 
 # As per kernel Makefile, avoid funny character set dependencies
 unexport LC_ALL
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to