From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756107AbaEERje (ORCPT ); Mon, 5 May 2014 13:39:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34718 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755108AbaEERgN (ORCPT ); Mon, 5 May 2014 13:36:13 -0400 From: Jiri Olsa To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Arnaldo Carvalho de Melo , Borislav Petkov , Corey Ashford , David Ahern , Frederic Weisbecker , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 04/12] perf tools: Remove unlikely define from perf.h Date: Mon, 5 May 2014 19:35:40 +0200 Message-Id: <1399311348-28152-5-git-send-email-jolsa@kernel.org> In-Reply-To: <1399311348-28152-1-git-send-email-jolsa@kernel.org> References: <1399311348-28152-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/include/linux/compiler.h header. Acked-by: Arnaldo Carvalho de Melo Acked-by: Peter Zijlstra 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 Link: http://lkml.kernel.org/r/1399293219-8732-3-git-send-email-jolsa@kernel.org Signed-off-by: Jiri Olsa --- tools/perf/perf.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 3bea2e6..a547f38 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -203,7 +203,6 @@ static inline unsigned long long rdclock(void) */ #define asmlinkage -#define unlikely(x) __builtin_expect(!!(x), 0) #define min(x, y) ({ \ typeof(x) _min1 = (x); \ typeof(y) _min2 = (y); \ -- 1.8.3.1