summaryrefslogtreecommitdiffstats
path: root/kernel/tools/perf/util
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/tools/perf/util')
-rw-r--r--kernel/tools/perf/util/cloexec.c4
-rw-r--r--kernel/tools/perf/util/symbol.c2
-rw-r--r--kernel/tools/perf/util/symbol.h3
3 files changed, 8 insertions, 1 deletions
diff --git a/kernel/tools/perf/util/cloexec.c b/kernel/tools/perf/util/cloexec.c
index 85b523885..2babddaa2 100644
--- a/kernel/tools/perf/util/cloexec.c
+++ b/kernel/tools/perf/util/cloexec.c
@@ -7,11 +7,15 @@
static unsigned long flag = PERF_FLAG_FD_CLOEXEC;
+#ifdef __GLIBC_PREREQ
+#if !__GLIBC_PREREQ(2, 6)
int __weak sched_getcpu(void)
{
errno = ENOSYS;
return -1;
}
+#endif
+#endif
static int perf_flag_probe(void)
{
diff --git a/kernel/tools/perf/util/symbol.c b/kernel/tools/perf/util/symbol.c
index 201f6c4ca..99378a5c5 100644
--- a/kernel/tools/perf/util/symbol.c
+++ b/kernel/tools/perf/util/symbol.c
@@ -1893,6 +1893,8 @@ int setup_intlist(struct intlist **list, const char *list_str,
pr_err("problems parsing %s list\n", list_name);
return -1;
}
+
+ symbol_conf.has_filter = true;
return 0;
}
diff --git a/kernel/tools/perf/util/symbol.h b/kernel/tools/perf/util/symbol.h
index 095615001..be0217989 100644
--- a/kernel/tools/perf/util/symbol.h
+++ b/kernel/tools/perf/util/symbol.h
@@ -105,7 +105,8 @@ struct symbol_conf {
demangle_kernel,
filter_relative,
show_hist_headers,
- branch_callstack;
+ branch_callstack,
+ has_filter;
const char *vmlinux_name,
*kallsyms_name,
*source_prefix,