Signed-off-by: David Ahern <dsah...@gmail.com>
Cc: Arnaldo Carvalho de Melo <a...@ghostprotocols.net>
Cc: Borislav Petkov <b...@alien8.de>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
Cc: Stephane Eranian <eran...@google.com>
---
tools/perf/Makefile | 1 -
tools/perf/ui/ui.h | 3 ++-
tools/perf/util/annotate.h | 3 ++-
tools/perf/util/hist.h | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index f4c3b02..0cee87c 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -672,7 +672,6 @@ ifdef CONFIG_NEWT
# Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
BASIC_CFLAGS += -I/usr/include/slang
- BASIC_CFLAGS += -DNEWT_SUPPORT
EXTLIBS += -lnewt -lslang
LIB_OBJS += $(OUTPUT)ui/browser.o
LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o
diff --git a/tools/perf/ui/ui.h b/tools/perf/ui/ui.h
index d86359c..b030017 100644
--- a/tools/perf/ui/ui.h
+++ b/tools/perf/ui/ui.h
@@ -4,6 +4,7 @@
#include <pthread.h>
#include <stdbool.h>
#include <linux/compiler.h>
+#include <linux/kconfig.h>
extern pthread_mutex_t ui__lock;
@@ -12,7 +13,7 @@ extern int use_browser;
void setup_browser(bool fallback_to_pager);
void exit_browser(bool wait_for_ok);
-#ifdef NEWT_SUPPORT
+#ifdef CONFIG_NEWT
int ui__init(void);
void ui__exit(bool wait_for_ok);
#else
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index c422440..0435758 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -10,6 +10,7 @@
#include <linux/list.h>
#include <linux/rbtree.h>
#include <pthread.h>
+#include <linux/kconfig.h>
struct ins;
@@ -141,7 +142,7 @@ int symbol__tty_annotate(struct symbol *sym, struct map
*map, int evidx,
bool print_lines, bool full_paths, int min_pcnt,
int max_lines);
-#ifdef NEWT_SUPPORT
+#ifdef CONFIG_NEWT
int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
struct hist_browser_timer *hbt);
#else
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 226a4ae..83c1627 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -5,6 +5,7 @@
#include <pthread.h>
#include "callchain.h"
#include "header.h"
+#include <linux/kconfig.h>
extern struct callchain_param callchain_param;
@@ -175,7 +176,7 @@ struct hist_browser_timer {
int refresh;
};
-#ifdef NEWT_SUPPORT
+#ifdef CONFIG_NEWT
#include "../ui/keysyms.h"
int hist_entry__tui_annotate(struct hist_entry *he, int evidx,
struct hist_browser_timer *hbt);
--
1.7.10.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
