From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932376AbaEEMf6 (ORCPT ); Mon, 5 May 2014 08:35:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58914 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932257AbaEEMeB (ORCPT ); Mon, 5 May 2014 08:34:01 -0400 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Arnaldo Carvalho de Melo , Borislav Petkov , Corey Ashford , David Ahern , Frederic Weisbecker , Ingo Molnar , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 03/10] perf tools: Remove min define from perf.h Date: Mon, 5 May 2014 14:33:32 +0200 Message-Id: <1399293219-8732-4-git-send-email-jolsa@kernel.org> In-Reply-To: <1399293219-8732-1-git-send-email-jolsa@kernel.org> References: <1399293219-8732-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's defined in tools/perf/util/include/linux/kernel.h header. Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Signed-off-by: Jiri Olsa --- tools/perf/perf.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/perf/perf.h b/tools/perf/perf.h index a547f38..50aa88d 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -203,12 +203,6 @@ static inline unsigned long long rdclock(void) */ #define asmlinkage -#define min(x, y) ({ \ - typeof(x) _min1 = (x); \ - typeof(y) _min2 = (y); \ - (void) (&_min1 == &_min2); \ - _min1 < _min2 ? _min1 : _min2; }) - extern bool test_attr__enabled; void test_attr__init(void); void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu, -- 1.8.3.1