From 8be26c539f0d4c77a798b20515ad6404d72de74d Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Mon, 5 May 2014 12:32:05 +0200 Subject: [PATCH] perf tools: Remove unlikely define from perf.h 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 3bea2e642fa9..a547f3819a12 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); \ -- 2.34.1