korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf_counter: Fix userspace build

Browse Source 
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>
This commit is contained in:
Peter Zijlstra 2009-05-23 18:28:58 +02:00 committed by Ingo Molnar
parent 682076ae1d
commit 1a482f38c5
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/perf_counter/builtin-record.c
View File

@ -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))

5
Documentation/perf_counter/builtin-stat.c
View File

@ -61,6 +61,7 @@
* Released under the GPL v2. (and only v2, not any later version)
*/
#include "perf.h"
#include "util/util.h"
#include <getopt.h>
@ -83,10 +84,6 @@
#include <linux/unistd.h>
#include <linux/types.h>
#include "../../include/linux/perf_counter.h"
#include "perf.h"
#define EVENT_MASK_KERNEL 1
#define EVENT_MASK_USER 2

5
Documentation/perf_counter/builtin-top.c
View File

@ -42,6 +42,7 @@
* Released under the GPL v2. (and only v2, not any later version)
*/
#include "perf.h"
#include "util/util.h"
#include <getopt.h>
@ -64,10 +65,6 @@
#include <linux/unistd.h>
#include <linux/types.h>
#include "../../include/linux/perf_counter.h"
#include "perf.h"
static int system_wide = 0;
static int nr_counters = 0;

31
Documentation/perf_counter/perf.h
View File

@ -1,6 +1,25 @@
#ifndef _PERF_PERF_H
#define _PERF_PERF_H
#if defined(__x86_64__) || defined(__i386__)
#include "../../arch/x86/include/asm/unistd.h"
#define rmb() asm volatile("lfence" ::: "memory")
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
#endif
#ifdef __powerpc__
#include "../../arch/powerpc/include/asm/unistd.h"
#define rmb() asm volatile ("sync" ::: "memory")
#define cpu_relax() asm volatile ("" ::: "memory");
#endif
#include <time.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/syscall.h>
#include "../../include/linux/perf_counter.h"
/*
* prctl(PR_TASK_PERF_COUNTERS_DISABLE) will (cheaply) disable all
* counters in the current task.
@ -26,18 +45,6 @@ static inline unsigned long long rdclock(void)
#define __user
#define asmlinkage
#if defined(__x86_64__) || defined(__i386__)
#include "../../arch/x86/include/asm/unistd.h"
#define rmb() asm volatile("lfence" ::: "memory")
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
#endif
#ifdef __powerpc__
#include "../../arch/powerpc/include/asm/unistd.h"
#define rmb() asm volatile ("sync" ::: "memory")
#define cpu_relax() asm volatile ("" ::: "memory");
#endif
#define unlikely(x) __builtin_expect(!!(x), 0)
#define min(x, y) ({ \
typeof(x) _min1 = (x); \