projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8be26c5
)
perf tools: Remove min define from perf.h
author
Jiri Olsa
<
[email protected]
>
Mon, 5 May 2014 10:34:12 +0000
(12:34 +0200)
committer
Jiri Olsa
<
[email protected]
>
Mon, 5 May 2014 15:46:41 +0000
(17:46 +0200)
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
patch
|
blob
|
history
diff --git
a/tools/perf/perf.h
b/tools/perf/perf.h
index a547f3819a12337ca0bb1fc1df0838d5d98237f1..50aa88ded2544e41e4f99d2e96761f3126968a22 100644
(file)
--- 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,