summaryrefslogtreecommitdiffstats
path: root/tools/perf/perf.h
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2014-05-05 12:34:12 +0200
committerJiri Olsa <jolsa@kernel.org>2014-05-05 17:46:41 +0200
commit1b7ae1c941af21ec386ea7c7e812ba430652731c (patch)
tree924d8e4dc27d9110b03c87e08039c15fe6cc7f20 /tools/perf/perf.h
parent8be26c539f0d4c77a798b20515ad6404d72de74d (diff)
downloadop-kernel-dev-1b7ae1c941af21ec386ea7c7e812ba430652731c.zip
op-kernel-dev-1b7ae1c941af21ec386ea7c7e812ba430652731c.tar.gz
perf tools: Remove min define from perf.h
It's defined in tools/perf/util/include/linux/kernel.h header. Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Acked-by: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Borislav Petkov <bp@suse.de> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1399293219-8732-4-git-send-email-jolsa@kernel.org Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Diffstat (limited to 'tools/perf/perf.h')
-rw-r--r--tools/perf/perf.h6
1 files changed, 0 insertions, 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,
OpenPOWER on IntegriCloud