From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 17 Mar 2010 10:31:45 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e4713e93b125497e9ba44d93de1bd9d8e5ad8946;p=linux-beck.git

Merge branch 'perf/urgent' into perf/core

Merge reason: We'll be queueing dependent changes.

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

e4713e93b125497e9ba44d93de1bd9d8e5ad8946
diff --cc tools/perf/builtin-top.c
index c968bd3391e0,1f529321607e..887ebbf5d1ff
--- a/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);