Merge branch 'perf/urgent' into perf/core

Merge reason: We'll be queueing dependent changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc tools/perf/builtin-top.c
index c968bd3,1f52932..887ebbf
--- 1/tools/perf/builtin-top.c
--- 2/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@@ -464,10 -455,10 +464,10 @@@ static void print_sym_table(void
        struct sym_entry *syme, *n;
        struct rb_root tmp = RB_ROOT;
        struct rb_node *nd;
-       int sym_width = 0, dso_width = 0, max_dso_width;
+       int sym_width = 0, dso_width = 0, dso_short_width = 0;
        const int win_width = winsize.ws_col - 1;
  
 -      samples = userspace_samples = 0;
 +      samples = userspace_samples = exact_samples = 0;
  
        /* Sort the active symbols */
        pthread_mutex_lock(&active_symbols_lock);

diff --cc tools/perf/util/symbol.c
Simple merge

diff --cc tools/perf/util/symbol.h
Simple merge