diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2013-05-02 17:37:49 +0200 | 
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2013-05-02 17:54:19 +0200 | 
| commit | c032862fba51a3ca504752d3a25186b324c5ce83 (patch) | |
| tree | 955dc2ba4ab3df76ecc2bb780ee84aca04967e8d /tools/perf/ui/browser.c | |
| parent | fda76e074c7737fc57855dd17c762e50ed526052 (diff) | |
| parent | 8700c95adb033843fc163d112b9d21d4fda78018 (diff) | |
| download | olio-linux-3.10-c032862fba51a3ca504752d3a25186b324c5ce83.tar.xz olio-linux-3.10-c032862fba51a3ca504752d3a25186b324c5ce83.zip  | |
Merge commit '8700c95adb03' into timers/nohz
The full dynticks tree needs the latest RCU and sched
upstream updates in order to fix some dependencies.
Merge a common upstream merge point that has these
updates.
Conflicts:
	include/linux/perf_event.h
	kernel/rcutree.h
	kernel/rcutree_plugin.h
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'tools/perf/ui/browser.c')
| -rw-r--r-- | tools/perf/ui/browser.c | 9 | 
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c index 809ea4632a3..bbc782e364b 100644 --- a/tools/perf/ui/browser.c +++ b/tools/perf/ui/browser.c @@ -2,7 +2,6 @@  #include "../cache.h"  #include "../../perf.h"  #include "libslang.h" -#include <newt.h>  #include "ui.h"  #include "util.h"  #include <linux/compiler.h> @@ -234,7 +233,7 @@ void ui_browser__reset_index(struct ui_browser *browser)  void __ui_browser__show_title(struct ui_browser *browser, const char *title)  {  	SLsmg_gotorc(0, 0); -	ui_browser__set_color(browser, NEWT_COLORSET_ROOT); +	ui_browser__set_color(browser, HE_COLORSET_ROOT);  	slsmg_write_nstring(title, browser->width + 1);  } @@ -514,6 +513,12 @@ static struct ui_browser_colorset {  		.bg	  = "default",  	},  	{ +		.colorset = HE_COLORSET_ROOT, +		.name	  = "root", +		.fg	  = "white", +		.bg	  = "blue", +	}, +	{  		.name = NULL,  	}  };  |