From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Michael Ellerman <michael@ellerman.id.au>,
Feng Tang <feng.tang@intel.com>,
Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 14/15] perf annotate: Fix build with NO_NEWT=1
Date: Thu, 28 Feb 2013 18:05:26 -0300 [thread overview]
Message-ID: <1362085527-25326-15-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1362085527-25326-1-git-send-email-acme@infradead.org>
From: Michael Ellerman <michael@ellerman.id.au>
Commit 18c9e5c "Make it to be able to skip unannotatable symbols" broke
the build with NO_NEWT=1:
CC builtin-annotate.o
builtin-annotate.c: In function 'hists__find_annotations':
builtin-annotate.c:161:4: error: duplicate case value
builtin-annotate.c:154:4: error: previously used here
make: *** [builtin-annotate.o] Error 1
This is because without NEWT support K_LEFT is #defined to -1 in
utils/hist.h
Fix it by shifting the K_LEFT/K_RIGHT #defines out of the likely range
of error values.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1361854923-1814-1-git-send-email-michael@ellerman.id.au
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/hist.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 3862468..609a115 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -208,8 +208,8 @@ static inline int script_browse(const char *script_opt __maybe_unused)
return 0;
}
-#define K_LEFT -1
-#define K_RIGHT -2
+#define K_LEFT -1000
+#define K_RIGHT -2000
#endif
#ifdef GTK2_SUPPORT
--
1.8.1.1.361.gec3ae6e
next prev parent reply other threads:[~2013-03-01 16:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-28 21:05 [GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 01/15] perf tools: check if -DFORTIFY_SOURCE=2 is allowed Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 02/15] perf tools: Remove a write-only variable in the debugfs code Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 03/15] perf tools: Honor parallel jobs Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 04/15] perf tools: Correct Makefile.include Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 05/15] perf tools: Sort command-list.txt alphabetically Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 06/15] perf tests: Make attr script verbose friendly Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 07/15] perf tests: Make attr script test event cpu Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 08/15] perf tests: Add attr record -C cpu test Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 09/15] perf tests: Add attr stat " Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 10/15] perf record: Fix -C option Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 11/15] perf tools: Introduce tools/lib/lk library Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 12/15] perf tools: Extract perf-specific stuff from debugfs.c Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 13/15] tools/vm: Switch to liblk library Arnaldo Carvalho de Melo
2013-02-28 21:05 ` Arnaldo Carvalho de Melo [this message]
2013-02-28 21:05 ` [PATCH 15/15] perf report: Fix build with NO_NEWT=1 Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362085527-25326-15-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=feng.tang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michael@ellerman.id.au \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).