]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
perf annotate: Fix build with NO_NEWT=1
authorMichael Ellerman <michael@ellerman.id.au>
Tue, 26 Feb 2013 05:02:02 +0000 (16:02 +1100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 13 Mar 2013 19:54:49 +0000 (16:54 -0300)
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

index 38624686ee9a145ffaacbcfa063e5d985da750f0..609a115e35cf153187c0fdd3ab5f46b46dc7c40c 100644 (file)
@@ -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