From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756712AbcCXHlT (ORCPT ); Thu, 24 Mar 2016 03:41:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43204 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbcCXHlL (ORCPT ); Thu, 24 Mar 2016 03:41:11 -0400 Date: Thu, 24 Mar 2016 00:40:57 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org, jolsa@kernel.org, acme@redhat.com, hpa@zytor.com, adrian.hunter@intel.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, namhyung@kernel.org, mingo@kernel.org, jolsa@kernel.org, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Remove unused DIE_IF macro Git-Commit-ID: 236f71eb94eb3dc5161bcd9310805ae6bd444ce0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 236f71eb94eb3dc5161bcd9310805ae6bd444ce0 Gitweb: http://git.kernel.org/tip/236f71eb94eb3dc5161bcd9310805ae6bd444ce0 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 23 Mar 2016 12:28:59 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 23 Mar 2016 12:30:42 -0300 perf tools: Remove unused DIE_IF macro Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-elxg25jd4dhwod4wqbko87qh@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/util.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index d0d50ce..1b06216 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -140,13 +140,6 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2))) #include "../../../include/linux/stringify.h" -#define DIE_IF(cnd) \ - do { if (cnd) \ - die(" at (" __FILE__ ":" __stringify(__LINE__) "): " \ - __stringify(cnd) "\n"); \ - } while (0) - - extern void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN); extern void set_warning_routine(void (*routine)(const char *err, va_list params));