diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-09 20:04:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-09 20:04:37 +0100 |
| commit | 14684b93019a2d2ece0df5acaf921924541b928d (patch) | |
| tree | 29cf04da2f22b85b6051b47b3731e91a43d4c94d /tools/perf/perf-sys.h | |
| parent | Merge branch 'sctp-rfc7829' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-14684b93019a2d2ece0df5acaf921924541b928d.tar.xz linux-14684b93019a2d2ece0df5acaf921924541b928d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
One conflict in the BPF samples Makefile, some fixes in 'net' whilst
we were converting over to Makefile.target rules in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/perf-sys.h')
| -rw-r--r-- | tools/perf/perf-sys.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index 63e4349a772a..15e458e150bd 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -15,7 +15,9 @@ void test_attr__init(void); void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu, int fd, int group_fd, unsigned long flags); -#define HAVE_ATTR_TEST +#ifndef HAVE_ATTR_TEST +#define HAVE_ATTR_TEST 1 +#endif static inline int sys_perf_event_open(struct perf_event_attr *attr, @@ -27,7 +29,7 @@ sys_perf_event_open(struct perf_event_attr *attr, fd = syscall(__NR_perf_event_open, attr, pid, cpu, group_fd, flags); -#ifdef HAVE_ATTR_TEST +#if HAVE_ATTR_TEST if (unlikely(test_attr__enabled)) test_attr__open(attr, pid, cpu, fd, group_fd, flags); #endif |