aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Olsa <[email protected]>2014-05-05 12:32:05 +0200
committerJiri Olsa <[email protected]>2014-05-05 17:46:10 +0200
commit8be26c539f0d4c77a798b20515ad6404d72de74d (patch)
treeca4b61d10b0f357765cca37bbd85fae5e74db1dd
parent3dd422b4a5009e7654846534d535758d4cc985db (diff)
perf tools: Remove unlikely define from perf.h
It's defined in tools/include/linux/compiler.h header. Acked-by: Arnaldo Carvalho de Melo <[email protected]> Acked-by: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Corey Ashford <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Jiri Olsa <[email protected]>
-rw-r--r--tools/perf/perf.h1
1 files changed, 0 insertions, 1 deletions
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); \