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-top.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-top.c')
-rw-r--r-- | Documentation/perf_counter/builtin-top.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/perf_counter/builtin-top.c b/Documentation/perf_counter/builtin-top.c index 814b2e4925e3..a3216a6018c4 100644 --- a/Documentation/perf_counter/builtin-top.c +++ b/Documentation/perf_counter/builtin-top.c | |||
@@ -42,6 +42,7 @@ | |||
42 | * Released under the GPL v2. (and only v2, not any later version) | 42 | * Released under the GPL v2. (and only v2, not any later version) |
43 | */ | 43 | */ |
44 | 44 | ||
45 | #include "perf.h" | ||
45 | #include "util/util.h" | 46 | #include "util/util.h" |
46 | 47 | ||
47 | #include <getopt.h> | 48 | #include <getopt.h> |
@@ -64,10 +65,6 @@ | |||
64 | #include <linux/unistd.h> | 65 | #include <linux/unistd.h> |
65 | #include <linux/types.h> | 66 | #include <linux/types.h> |
66 | 67 | ||
67 | #include "../../include/linux/perf_counter.h" | ||
68 | |||
69 | #include "perf.h" | ||
70 | |||
71 | static int system_wide = 0; | 68 | static int system_wide = 0; |
72 | 69 | ||
73 | static int nr_counters = 0; | 70 | static int nr_counters = 0; |