From: tip-bot for Michael Ellerman <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, michael@ellerman.id.au, namhyung.kim@lge.com,
namhyung@kernel.org, tglx@linutronix.de, feng.tang@intel.com
Subject: [tip:perf/urgent] perf annotate: Fix build with NO_NEWT=1
Date: Mon, 18 Mar 2013 03:50:12 -0700 [thread overview]
Message-ID: <tip-1e825efb571a87d039cb3fe7ca833a25f11c7cb9@git.kernel.org> (raw)
In-Reply-To: <1361854923-1814-1-git-send-email-michael@ellerman.id.au>
Commit-ID: 1e825efb571a87d039cb3fe7ca833a25f11c7cb9
Gitweb: http://git.kernel.org/tip/1e825efb571a87d039cb3fe7ca833a25f11c7cb9
Author: Michael Ellerman <michael@ellerman.id.au>
AuthorDate: Tue, 26 Feb 2013 16:02:02 +1100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 13 Mar 2013 16:54:49 -0300
perf annotate: Fix build with NO_NEWT=1
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
prev parent reply other threads:[~2013-03-18 10:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-26 5:02 [PATCH 1/2] perf annotate: Fix build with NO_NEWT=1 Michael Ellerman
2013-02-26 5:02 ` [PATCH 2/2] perf report: " Michael Ellerman
2013-02-26 8:48 ` Feng Tang
2013-02-26 11:46 ` Michael Ellerman
2013-03-18 10:51 ` [tip:perf/urgent] " tip-bot for Michael Ellerman
2013-02-26 9:02 ` [PATCH 1/2] perf annotate: " Namhyung Kim
2013-02-27 1:14 ` li guang
2013-02-27 1:22 ` Michael Ellerman
2013-02-27 1:29 ` li guang
2013-02-27 1:29 ` li guang
2013-02-27 2:31 ` Namhyung Kim
2013-03-18 10:50 ` tip-bot for Michael Ellerman [this message]
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=tip-1e825efb571a87d039cb3fe7ca833a25f11c7cb9@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=feng.tang@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=michael@ellerman.id.au \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
/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