From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760475Ab3DBDzF (ORCPT ); Mon, 1 Apr 2013 23:55:05 -0400 Received: from mail-pb0-f49.google.com ([209.85.160.49]:49274 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760457Ab3DBDzB (ORCPT ); Mon, 1 Apr 2013 23:55:01 -0400 From: David Ahern To: acme@ghostprotocols.net, linux-kernel@vger.kernel.org Cc: David Ahern , Borislav Petkov , Frederic Weisbecker , Ingo Molnar , Jiri Olsa , Namhyung Kim , Peter Zijlstra , Stephane Eranian Subject: [PATCH 06/23] perf: remove NEWT_SUPPORT in favor of CONFIG_NEWT Date: Mon, 1 Apr 2013 21:54:20 -0600 Message-Id: <1364874877-5618-7-git-send-email-dsahern@gmail.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1364874877-5618-1-git-send-email-dsahern@gmail.com> References: <1364874877-5618-1-git-send-email-dsahern@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: David Ahern Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian --- 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 #include #include +#include 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 #include #include +#include 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 #include "callchain.h" #include "header.h" +#include 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