Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965613AbaFCWOO (ORCPT ); Tue, 3 Jun 2014 18:14:14 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:41757 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965230AbaFCWI7 (ORCPT ); Tue, 3 Jun 2014 18:08:59 -0400 From: Alexis Berlemont To: linux-kernel@vger.kernel.org Cc: Alexis Berlemont , jolsa@redhat.com, dsahern@gmail.com, mingo@kernel.org, sam@ravnborg.org, mmarek@suse.cz Subject: [PATCH 17/32] perf kbuild: remove legacy on_exit-related build variable Date: Wed, 4 Jun 2014 00:06:10 +0200 Message-Id: <1401833185-10347-18-git-send-email-alexis.berlemont@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1401833185-10347-1-git-send-email-alexis.berlemont@gmail.com> References: <1401833185-10347-1-git-send-email-alexis.berlemont@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove HAVE_ON_EXIT_SUPPORT (replaced by CONFIG_ON_EXIT) --- tools/perf/Kconfig | 6 ++++++ tools/perf/builtin-record.c | 4 +++- tools/perf/config/Makefile | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/perf/Kconfig b/tools/perf/Kconfig index 762c50e..a00bfb6 100644 --- a/tools/perf/Kconfig +++ b/tools/perf/Kconfig @@ -196,6 +196,12 @@ config TIMERFD ---help--- Timer via file descriptor +config ON_EXIT + bool "Support of on_exit() function" + default n + ---help--- + On exit support + config DEMANGLE bool "Demangle symbols" default n diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 8ce62ef..372a812 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -5,6 +5,8 @@ * (or a CPU, or a PID) into the perf.data output file - for * later analysis via perf report. */ + +#include "generated/autoconf.h" #include "builtin.h" #include "perf.h" @@ -30,7 +32,7 @@ #include #include -#ifndef HAVE_ON_EXIT_SUPPORT +#ifndef CONFIG_ON_EXIT #ifndef ATEXIT_MAX #define ATEXIT_MAX 32 #endif diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index ff7f01c..c128f30 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -566,9 +566,9 @@ ifdef CONFIG_LIBIBERTY_ONLY endif endif -ifndef NO_ON_EXIT - ifeq ($(feature-on-exit), 1) - CFLAGS += -DHAVE_ON_EXIT_SUPPORT +ifdef CONFIG_ON_EXIT + ifneq ($(feature-on-exit), 1) + $(shell $(KCONFIG_SCRIPT) -d CONFIG_ON_EXIT) endif endif -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/