summaryrefslogtreecommitdiff
path: root/Documentation/perf_counter/builtin-record.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-05-23 18:28:58 +0200
committerIngo Molnar <mingo@elte.hu>2009-05-23 19:37:46 +0200
commit1a482f38c5aafeb3576079a38a5b21b46619f3d2 (patch)
tree6946791cf82545e1a2bd0baa8e70a9d7ec17ee68 /Documentation/perf_counter/builtin-record.c
parent682076ae1de0aba9c2da509f7b19dc03e30a6e1f (diff)
downloadlwn-1a482f38c5aafeb3576079a38a5b21b46619f3d2.tar.gz
lwn-1a482f38c5aafeb3576079a38a5b21b46619f3d2.zip
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-record.c')
-rw-r--r--Documentation/perf_counter/builtin-record.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/perf_counter/builtin-record.c b/Documentation/perf_counter/builtin-record.c
index efb87595f3cb..1b19f187d352 100644
--- a/Documentation/perf_counter/builtin-record.c
+++ b/Documentation/perf_counter/builtin-record.c
@@ -1,5 +1,6 @@
+#include "perf.h"
#include "util/util.h"
#include <sys/types.h>
@@ -30,9 +31,7 @@
#include <linux/unistd.h>
#include <linux/types.h>
-#include "../../include/linux/perf_counter.h"
-#include "perf.h"
#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1)
#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask))