Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b7ae1c9 authored by Jiri Olsa's avatar Jiri Olsa
Browse files

perf tools: Remove min define from perf.h 



It's defined in tools/perf/util/include/linux/kernel.h header.

Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarPeter 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: default avatarJiri Olsa <jolsa@kernel.org>
parent 8be26c53

tools/perf/perf.h

+0 −6
Original line number Diff line number Diff line
@@ -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,