Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / tools / perf / perf.h

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index a1a97956136f966a8f7240f4838e131232a93da8..21bf7f5a3cf51a1a42e3169daa738c8e7e0a8d83 100644 (file)
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -5,6 +5,7 @@
 #include <time.h>
 #include <stdbool.h>
 #include <linux/types.h>
+#include <linux/stddef.h>
 #include <linux/perf_event.h>
 
 extern bool test_attr__enabled;
@@ -24,7 +25,9 @@ static inline unsigned long long rdclock(void)
        return ts.tv_sec * 1000000000ULL + ts.tv_nsec;
 }
 
+#ifndef MAX_NR_CPUS
 #define MAX_NR_CPUS                    1024
+#endif
 
 extern const char *input_name;
 extern bool perf_host, perf_guest;