Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

1 files changed, 11 insertions, 9 deletions

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 9ded38ced234..914c67095d96 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -72,8 +72,7 @@ static int e_snprintf(char *str, size_t size, const char *format, ...)
 }
 
 static char *synthesize_perf_probe_point(struct perf_probe_point *pp);
-static struct map_groups kmap_groups;
-static struct map *kmaps[MAP__NR_TYPES];
+static struct machine machine;
 
 /* Initialize symbol maps and path of vmlinux */
 static int init_vmlinux(void)
@@ -92,12 +91,15 @@ static int init_vmlinux(void)
                 goto out;
         }
 
+        ret = machine__init(&machine, "/", 0);
+        if (ret < 0)
+                goto out;
+
         kernel = dso__new_kernel(symbol_conf.vmlinux_name);
         if (kernel == NULL)
                 die("Failed to create kernel dso.");
 
-        map_groups__init(&kmap_groups);
-        ret = __map_groups__create_kernel_maps(&kmap_groups, kmaps, kernel);
+        ret = __machine__create_kernel_maps(&machine, kernel);
         if (ret < 0)
                 pr_debug("Failed to create kernel maps.\n");
 
@@ -110,12 +112,12 @@ out:
 #ifdef DWARF_SUPPORT
 static int open_vmlinux(void)
 {
-        if (map__load(kmaps[MAP__FUNCTION], NULL) < 0) {
+        if (map__load(machine.vmlinux_maps[MAP__FUNCTION], NULL) < 0) {
                 pr_debug("Failed to load kernel map.\n");
                 return -EINVAL;
         }
-        pr_debug("Try to open %s\n", kmaps[MAP__FUNCTION]->dso->long_name);
-        return open(kmaps[MAP__FUNCTION]->dso->long_name, O_RDONLY);
+        pr_debug("Try to open %s\n", machine.vmlinux_maps[MAP__FUNCTION]->dso->long_name);
+        return open(machine.vmlinux_maps[MAP__FUNCTION]->dso->long_name, O_RDONLY);
 }
 
 /* Convert trace point to probe point with debuginfo */
@@ -125,7 +127,7 @@ static int convert_to_perf_probe_point(struct kprobe_trace_point *tp,
         struct symbol *sym;
         int fd, ret = -ENOENT;
 
-        sym = map__find_symbol_by_name(kmaps[MAP__FUNCTION],
+        sym = map__find_symbol_by_name(machine.vmlinux_maps[MAP__FUNCTION],
                                        tp->symbol, NULL);
         if (sym) {
                 fd = open_vmlinux();
@@ -1466,7 +1468,7 @@ static int convert_to_kprobe_trace_events(struct perf_probe_event *pev,
         }
 
         /* Currently just checking function name from symbol map */
-        sym = map__find_symbol_by_name(kmaps[MAP__FUNCTION],
+        sym = map__find_symbol_by_name(machine.vmlinux_maps[MAP__FUNCTION],
                                        tev->point.symbol, NULL);
         if (!sym) {
                 pr_warning("Kernel symbol \'%s\' not found.\n",