aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-09-28 05:32:01 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-10-02 17:36:21 -0400
commitf315e16850d00ae5b19f11810bc00bf68cf3c24a (patch)
treeee3dbf40f58beabc30b5c0e11b3db3ec85bc5588
parent95485b1cda827e4db7102ad5fde1791087a0f4c5 (diff)
perf tools: Convert to LIBAUDIT_SUPPORT
For building perf without libaudit, we can set NO_LIBAUDIT=1 as a argument of make. It then defines NO_LIBAUDIT_SUPPORT macro for C code to do the proper handling. However it usually used in a negative semantics - e.g. #ifndef - so we saw double negations which can be misleading. Convert it to a positive form to make it more readable. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1348824728-14025-6-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/Makefile6
-rw-r--r--tools/perf/perf.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 676302441e14..99b2bb371bcd 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -543,14 +543,12 @@ ifndef NO_LIBUNWIND
543 LIB_OBJS += $(OUTPUT)util/unwind.o 543 LIB_OBJS += $(OUTPUT)util/unwind.o
544endif 544endif
545 545
546ifdef NO_LIBAUDIT 546ifndef NO_LIBAUDIT
547 BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT
548else
549 FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit 547 FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit
550 ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT)),y) 548 ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT)),y)
551 msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev); 549 msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev);
552 BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT
553 else 550 else
551 BASIC_CFLAGS += -DLIBAUDIT_SUPPORT
554 BUILTIN_OBJS += $(OUTPUT)builtin-trace.o 552 BUILTIN_OBJS += $(OUTPUT)builtin-trace.o
555 EXTLIBS += -laudit 553 EXTLIBS += -laudit
556 endif 554 endif
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index dacae4b8bcb4..6d50eb0b4251 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -55,7 +55,7 @@ static struct cmd_struct commands[] = {
55 { "lock", cmd_lock, 0 }, 55 { "lock", cmd_lock, 0 },
56 { "kvm", cmd_kvm, 0 }, 56 { "kvm", cmd_kvm, 0 },
57 { "test", cmd_test, 0 }, 57 { "test", cmd_test, 0 },
58#ifndef NO_LIBAUDIT_SUPPORT 58#ifdef LIBAUDIT_SUPPORT
59 { "trace", cmd_trace, 0 }, 59 { "trace", cmd_trace, 0 },
60#endif 60#endif
61 { "inject", cmd_inject, 0 }, 61 { "inject", cmd_inject, 0 },