diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-05-23 12:28:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-23 13:37:46 -0400 |
commit | 1a482f38c5aafeb3576079a38a5b21b46619f3d2 (patch) | |
tree | 6946791cf82545e1a2bd0baa8e70a9d7ec17ee68 /Documentation/perf_counter/builtin-stat.c | |
parent | 682076ae1de0aba9c2da509f7b19dc03e30a6e1f (diff) |
perf_counter: Fix userspace build
recent userspace (F11) seems to already include the
linux/unistd.h bits which means we cannot include the version
in the kernel sources due to the header guards being the same.
Ensure we include the kernel version first.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
LKML-Reference: <20090523163012.739756497@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/perf_counter/builtin-stat.c')
-rw-r--r-- | Documentation/perf_counter/builtin-stat.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/perf_counter/builtin-stat.c b/Documentation/perf_counter/builtin-stat.c index 03518d75d864..8ae01d51f291 100644 --- a/Documentation/perf_counter/builtin-stat.c +++ b/Documentation/perf_counter/builtin-stat.c | |||
@@ -61,6 +61,7 @@ | |||
61 | * Released under the GPL v2. (and only v2, not any later version) | 61 | * Released under the GPL v2. (and only v2, not any later version) |
62 | */ | 62 | */ |
63 | 63 | ||
64 | #include "perf.h" | ||
64 | #include "util/util.h" | 65 | #include "util/util.h" |
65 | 66 | ||
66 | #include <getopt.h> | 67 | #include <getopt.h> |
@@ -83,10 +84,6 @@ | |||
83 | #include <linux/unistd.h> | 84 | #include <linux/unistd.h> |
84 | #include <linux/types.h> | 85 | #include <linux/types.h> |
85 | 86 | ||
86 | #include "../../include/linux/perf_counter.h" | ||
87 | |||
88 | #include "perf.h" | ||
89 | |||
90 | #define EVENT_MASK_KERNEL 1 | 87 | #define EVENT_MASK_KERNEL 1 |
91 | #define EVENT_MASK_USER 2 | 88 | #define EVENT_MASK_USER 2 |
92 | 89 | ||