mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +00:00
25b8592e91
'make -C tools/perf build-test' is failing with below log for poewrpc.
In file included from /tmp/tmp.3eEwmGlYaF/perf-4.8.0-rc4/tools/perf/perf.h:15:0,
from util/cpumap.h:8,
from util/env.c:1:
/tmp/tmp.3eEwmGlYaF/perf-4.8.0-rc4/tools/perf/perf-sys.h:23:56:
fatal error: ../../arch/powerpc/include/uapi/asm/unistd.h: No such file or directory
compilation terminated.
I bisected it and found it's failing from commit ad430729ae ("Remove:
kernel unistd*h files from perf's MANIFEST, not used").
Header file '../../arch/powerpc/include/uapi/asm/unistd.h' is included
only for powerpc in tools/perf/perf-sys.h.
By looking closly at commit history, I found little weird thing:
Commit f2d9cae9ea ("perf powerpc: Use uapi/unistd.h to fix build
error") replaced 'asm/unistd.h' with 'uapi/asm/unistd.h'
Commit d2709c7ce4 ("perf: Make perf build for x86 with UAPI
disintegration applied") removes all arch specific 'uapi/asm/unistd.h'
for all archs and adds generic <asm/unistd.h>.
Commit f0b9abfb04 ("Merge branch 'linus' into perf/core") again
includes 'uapi/asm/unistd.h' for powerpc. Don't know how exactly this
happened as this change is not part of commit also.
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1472630591-5089-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com
Fixes: ad430729ae ("Remove: kernel unistd*h files from perf's MANIFEST, not used")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
102 lines
1.8 KiB
C
102 lines
1.8 KiB
C
#ifndef _PERF_SYS_H
|
|
#define _PERF_SYS_H
|
|
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/syscall.h>
|
|
#include <linux/types.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/perf_event.h>
|
|
#include <asm/barrier.h>
|
|
|
|
#if defined(__i386__)
|
|
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
|
|
#define CPUINFO_PROC {"model name"}
|
|
#endif
|
|
|
|
#if defined(__x86_64__)
|
|
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
|
|
#define CPUINFO_PROC {"model name"}
|
|
#endif
|
|
|
|
#ifdef __powerpc__
|
|
#define CPUINFO_PROC {"cpu"}
|
|
#endif
|
|
|
|
#ifdef __s390__
|
|
#define CPUINFO_PROC {"vendor_id"}
|
|
#endif
|
|
|
|
#ifdef __sh__
|
|
#define CPUINFO_PROC {"cpu type"}
|
|
#endif
|
|
|
|
#ifdef __hppa__
|
|
#define CPUINFO_PROC {"cpu"}
|
|
#endif
|
|
|
|
#ifdef __sparc__
|
|
#define CPUINFO_PROC {"cpu"}
|
|
#endif
|
|
|
|
#ifdef __alpha__
|
|
#define CPUINFO_PROC {"cpu model"}
|
|
#endif
|
|
|
|
#ifdef __ia64__
|
|
#define cpu_relax() asm volatile ("hint @pause" ::: "memory")
|
|
#define CPUINFO_PROC {"model name"}
|
|
#endif
|
|
|
|
#ifdef __arm__
|
|
#define CPUINFO_PROC {"model name", "Processor"}
|
|
#endif
|
|
|
|
#ifdef __aarch64__
|
|
#define cpu_relax() asm volatile("yield" ::: "memory")
|
|
#endif
|
|
|
|
#ifdef __mips__
|
|
#define CPUINFO_PROC {"cpu model"}
|
|
#endif
|
|
|
|
#ifdef __arc__
|
|
#define CPUINFO_PROC {"Processor"}
|
|
#endif
|
|
|
|
#ifdef __metag__
|
|
#define CPUINFO_PROC {"CPU"}
|
|
#endif
|
|
|
|
#ifdef __xtensa__
|
|
#define CPUINFO_PROC {"core ID"}
|
|
#endif
|
|
|
|
#ifdef __tile__
|
|
#define cpu_relax() asm volatile ("mfspr zero, PASS" ::: "memory")
|
|
#define CPUINFO_PROC {"model name"}
|
|
#endif
|
|
|
|
#ifndef cpu_relax
|
|
#define cpu_relax() barrier()
|
|
#endif
|
|
|
|
static inline int
|
|
sys_perf_event_open(struct perf_event_attr *attr,
|
|
pid_t pid, int cpu, int group_fd,
|
|
unsigned long flags)
|
|
{
|
|
int fd;
|
|
|
|
fd = syscall(__NR_perf_event_open, attr, pid, cpu,
|
|
group_fd, flags);
|
|
|
|
#ifdef HAVE_ATTR_TEST
|
|
if (unlikely(test_attr__enabled))
|
|
test_attr__open(attr, pid, cpu, fd, group_fd, flags);
|
|
#endif
|
|
return fd;
|
|
}
|
|
|
|
#endif /* _PERF_SYS_H */
|