diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-23 18:43:48 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-23 18:43:48 +0900 |
| commit | a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc (patch) | |
| tree | bfdc42183f5aac21f605a30a4a511298ab91e3c5 /tools/perf/util/include/linux/kernel.h | |
| parent | 955c9863bb5855a994751843e7066017edc00410 (diff) | |
| parent | 5bdef865eb358b6f3760e25e591ae115e9eeddef (diff) | |
| download | kernel-crypto-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.tar.gz kernel-crypto-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.tar.xz kernel-crypto-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.zip | |
Merge branch 'sh/kfr2r09'
Diffstat (limited to 'tools/perf/util/include/linux/kernel.h')
| -rw-r--r-- | tools/perf/util/include/linux/kernel.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/perf/util/include/linux/kernel.h b/tools/perf/util/include/linux/kernel.h index 99c1b3d1edd..a6b87390cb5 100644 --- a/tools/perf/util/include/linux/kernel.h +++ b/tools/perf/util/include/linux/kernel.h @@ -18,4 +18,12 @@ (type *)((char *)__mptr - offsetof(type, member)); }) #endif +#ifndef max +#define max(x, y) ({ \ + typeof(x) _max1 = (x); \ + typeof(y) _max2 = (y); \ + (void) (&_max1 == &_max2); \ + _max1 > _max2 ? _max1 : _max2; }) +#endif + #endif |