Commit-ID: 1b7ae1c941af21ec386ea7c7e812ba430652731c Gitweb: http://git.kernel.org/tip/1b7ae1c941af21ec386ea7c7e812ba430652731c Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 5 May 2014 12:34:12 +0200 Committer: Jiri Olsa <[email protected]> CommitDate: Mon, 5 May 2014 17:46:41 +0200
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 <[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]> --- tools/perf/perf.h | 6 ------ 1 file changed, 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, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
