Merge "Remove an elfutils-related hack from perf(1)."
diff --git a/perf-3.12.0/tools/perf/util/probe-finder.c b/perf-3.12.0/tools/perf/util/probe-finder.c
index 5938378..2b74d8e 100644
--- a/perf-3.12.0/tools/perf/util/probe-finder.c
+++ b/perf-3.12.0/tools/perf/util/probe-finder.c
@@ -147,27 +147,6 @@
return -ENOENT;
}
-#if defined(ANDROID_PATCHES)
-/*
- * Bionic doesn't have stdio_ext.h which is used by dwfl_linux_kernel_find_elf.
- * So we just disable the new feature here even though we are pairing perf with
- * elfutils 0.153 now.
- */
-/* With older elfutils, this just support kernel module... */
-static int debuginfo__init_online_kernel_dwarf(struct debuginfo *self,
- Dwarf_Addr addr __maybe_unused)
-{
- const char *path = kernel_get_module_path("kernel");
-
- if (!path) {
- pr_err("Failed to find vmlinux path\n");
- return -ENOENT;
- }
-
- pr_debug2("Use file %s for debuginfo\n", path);
- return debuginfo__init_offline_dwarf(self, path);
-}
-#else
#if _ELFUTILS_PREREQ(0, 148)
/* This method is buggy if elfutils is older than 0.148 */
static int __linux_kernel_find_elf(Dwfl_Module *mod,
@@ -225,7 +204,6 @@
return 0;
}
#endif
-#endif
struct debuginfo *debuginfo__new(const char *path)
{