diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-17 21:24:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-17 21:24:30 +0300 |
| commit | 59b2858f57bbd42f36aa177d21ab011a87da3de2 (patch) | |
| tree | 3299a124180b88117db9ef68e4133426e2309548 /tools/perf/perf-sys.h | |
| parent | fc7f0dd381720ea5ee5818645f7d0e9dece41cb0 (diff) | |
| parent | d01de2389c0190f5959f0a1258a2e87d2fe4ca82 (diff) | |
| download | linux-59b2858f57bbd42f36aa177d21ab011a87da3de2.tar.xz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Mostly tooling fixes, but also two PMU driver fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools powerpc: Use dwfl_report_elf() instead of offline.
perf tools: Fix segfault for symbol annotation on TUI
perf test: Fix dwarf unwind using libunwind.
perf tools: Avoid build splat for syscall numbers with uclibc
perf tools: Elide strlcpy warning with uclibc
perf tools: Fix statfs.f_type data type mismatch build error with uclibc
tools: Remove bitops/hweight usage of bits in tools/perf
perf machine: Fix __machine__findnew_thread() error path
perf tools: Fix building error in x86_64 when dwarf unwind is on
perf probe: Propagate error code when write(2) failed
perf/x86/intel: Fix bug for "cycles:p" and "cycles:pp" on SLM
perf/rapl: Fix sysfs_show() initialization for RAPL PMU
Diffstat (limited to 'tools/perf/perf-sys.h')
| -rw-r--r-- | tools/perf/perf-sys.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index a3b13d7dc1d4..6ef68165c9db 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -6,7 +6,6 @@ #include <sys/syscall.h> #include <linux/types.h> #include <linux/perf_event.h> -#include <asm/unistd.h> #if defined(__i386__) #define mb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory") |