diff options
| author | Chris E Ferron <chris.e.ferron@linux.intel.com> | 2012-07-20 15:14:08 -0700 |
|---|---|---|
| committer | Chris E Ferron <chris.e.ferron@linux.intel.com> | 2012-07-20 15:14:08 -0700 |
| commit | 9ce9ec662ce7b642967fd75222114b624b8a503a (patch) | |
| tree | 0e5c70427c7c89e07651f5659180d38f85efc635 | |
| parent | 1c7b4b999cb172b59833f829ab7b95fab11d7a00 (diff) | |
removed re-define of __NR_perf_event_open, what was needed for stale headers in older kernels. sys/syscall.h will not be correct.
| -rw-r--r-- | src/perf/perf.cpp | 10 | ||||
| -rw-r--r-- | src/perf/perf_event.h | 12 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/perf/perf.cpp b/src/perf/perf.cpp index 8673575..102e224 100644 --- a/src/perf/perf.cpp +++ b/src/perf/perf.cpp @@ -27,7 +27,6 @@ #include <fstream> #include <unistd.h> -#include <sys/syscall.h> /* For SYS_xxx definitions */ #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -40,15 +39,6 @@ #include <fcntl.h> #include "perf_event.h" - -/* __NR_perf_event_open in ia64 and alpha is defined elsewhere */ -#ifdef __ia64__ -#include <asm-generic/unistd.h> -#endif -#ifdef __alpha__ -#include <asm-generic/unistd.h> -#endif - #include "perf.h" #include "../lib.h" #include "../display.h" diff --git a/src/perf/perf_event.h b/src/perf/perf_event.h index 01fd065..92a38b8 100644 --- a/src/perf/perf_event.h +++ b/src/perf/perf_event.h @@ -41,17 +41,7 @@ #include <linux/types.h> #include <linux/ioctl.h> #include <asm/byteorder.h> - - -/* some people have stale headers */ -#ifndef __NR_perf_event_open -#ifdef __i386__ -#define __NR_perf_event_open 336 -#endif -#if __x86_64__ -#define __NR_perf_event_open 298 -#endif -#endif +#include <sys/syscall.h> /* |