Commit-ID: 8be26c539f0d4c77a798b20515ad6404d72de74d
Gitweb: http://git.kernel.org/tip/8be26c539f0d4c77a798b20515ad6404d72de74d
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Mon, 5 May 2014 12:32:05 +0200
Committer: Jiri Olsa <jolsa@xxxxxxxxxx>
CommitDate: Mon, 5 May 2014 17:46:10 +0200
perf tools: Remove unlikely define from perf.h
It's defined in tools/include/linux/compiler.h header.
Acked-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1399293219-8732-3-git-send-email-jolsa@xxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
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); \
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|