5 files changed, 23 insertions, 2 deletions

diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index d4536a9e0d8c..155749d74350 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -57,6 +57,16 @@ void ui__warning(const char *format, ...)
 }
 #endif
 
+void ui__warning_paranoid(void)
+{
+        ui__warning("Permission error - are you root?\n"
+                    "Consider tweaking /proc/sys/kernel/perf_event_paranoid:\n"
+                    " -1 - Not paranoid at all\n"
+                    "  0 - Disallow raw tracepoint access for unpriv\n"
+                    "  1 - Disallow cpu events for unpriv\n"
+                    "  2 - Disallow kernel profiling for unpriv\n");
+}
+
 void trace_event(union perf_event *event)
 {
         unsigned char *raw_event = (void *)event;
diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
index 93516cf4682c..fd53db47e3de 100644
--- a/tools/perf/util/debug.h
+++ b/tools/perf/util/debug.h
@@ -36,5 +36,6 @@ int ui_helpline__show_help(const char *format, va_list ap);
 #endif
 
 void ui__warning(const char *format, ...) __attribute__((format(printf, 1, 2)));
+void ui__warning_paranoid(void);
 
 #endif  /* __PERF_DEBUG_H */
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 2b15c362ef56..1023f67633a4 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -710,7 +710,7 @@ try_again:
                  * in the whole kernel symbol list.
                  */
                 if ((long long)al->addr < 0 &&
-                    cpumode == PERF_RECORD_MISC_KERNEL &&
+                    cpumode == PERF_RECORD_MISC_USER &&
                     machine && mg != &machine->kmaps) {
                         mg = &machine->kmaps;
                         goto try_again;
diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py
index e24ffadb20b2..bbc982f5dd8b 100644
--- a/tools/perf/util/setup.py
+++ b/tools/perf/util/setup.py
@@ -1,13 +1,18 @@
 #!/usr/bin/python2
 
 from distutils.core import setup, Extension
+from os import getenv
+
+cflags = ['-fno-strict-aliasing', '-Wno-write-strings']
+cflags += getenv('CFLAGS', '').split()
 
 perf = Extension('perf',
                   sources = ['util/python.c', 'util/ctype.c', 'util/evlist.c',
                              'util/evsel.c', 'util/cpumap.c', 'util/thread_map.c',
                              'util/util.c', 'util/xyarray.c', 'util/cgroup.c'],
                   include_dirs = ['util/include'],
-                  extra_compile_args = ['-fno-strict-aliasing', '-Wno-write-strings'])
+                  extra_compile_args = cflags,
+                 )
 
 setup(name='perf',
       version='0.1',
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 17df793c8924..f06c10f092ba 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1196,6 +1196,8 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name,
                                 if (curr_dso == NULL)
                                         goto out_elf_end;
                                 curr_dso->kernel = self->kernel;
+                                curr_dso->long_name = self->long_name;
+                                curr_dso->long_name_len = self->long_name_len;
                                 curr_map = map__new2(start, curr_dso,
                                                      map->type);
                                 if (curr_map == NULL) {
@@ -1842,6 +1844,7 @@ int dso__load_vmlinux(struct dso *self, struct map *map,
         if (fd < 0)
                 return -1;
 
+        dso__set_long_name(self, (char *)vmlinux);
         dso__set_loaded(self, map->type);
         err = dso__load_sym(self, map, symfs_vmlinux, fd, filter, 0, 0);
         close(fd);
@@ -2403,6 +2406,8 @@ int symbol__init(void)
         if (symbol_conf.initialized)
                 return 0;
 
+        symbol_conf.priv_size = ALIGN(symbol_conf.priv_size, sizeof(u64));
+
         elf_version(EV_CURRENT);
         if (symbol_conf.sort_by_name)
                 symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -