Merge remote-tracking branch 'tip/perf/core' into perf/urgent

[linux-2.6-block.git] / tools / perf / util / machine.c

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index e00dc413652d43f397d754f9ecd764b4af75139d..147ed85ea2bc2619f55eab46d5905dd898ede9be 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -15,6 +15,7 @@
 #include "strlist.h"
 #include "thread.h"
 #include "vdso.h"
+#include "util.h"
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -24,7 +25,7 @@
 #include "asm/bug.h"
 #include "bpf-event.h"
 
-#include "sane_ctype.h"
+#include <linux/ctype.h>
 #include <symbol/kallsyms.h>
 #include <linux/mman.h>
 
@@ -716,12 +717,12 @@ static int machine__process_ksymbol_register(struct machine *machine,
                        return -ENOMEM;
 
                map->start = event->ksymbol_event.addr;
-               map->pgoff = map->start;
                map->end = map->start + event->ksymbol_event.len;
                map_groups__insert(&machine->kmaps, map);
        }
 
-       sym = symbol__new(event->ksymbol_event.addr, event->ksymbol_event.len,
+       sym = symbol__new(map->map_ip(map, map->start),
+                         event->ksymbol_event.len,
                          0, 0, event->ksymbol_event.name);
        if (!sym)
                return -ENOMEM;
@@ -1253,9 +1254,9 @@ static char *get_kernel_version(const char *root_dir)
                return NULL;
 
        tmp = fgets(version, sizeof(version), file);
-       if (!tmp)
-               *version = '\0';
        fclose(file);
+       if (!tmp)
+               return NULL;
 
        name = strstr(version, prefix);
        if (!name)