From 5b4ab88d80f242acc9beeb95a3c311d2834f6de7 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Mon, 30 Apr 2012 13:55:06 +0900
Subject: [PATCH] --- yaml --- r: 304911 b: refs/heads/master c:
 7706f966323f32f3ea13121b5918851432876ae5 h: refs/heads/master i:   304909:
 6d3fc85f9d54f8c10a8cc07a8f01ee6eb8b716df   304907:
 7464431e8b740b8b0c1d4456a105525b218b7717   304903:
 82f85b471e54ef916d9261bbe2d6ffa170fb62a3   304895:
 a375f8b21410d284cf72663c87695d2319b62022 v: v3

---
 [refs]                            | 2 +-
 trunk/tools/perf/builtin-report.c | 2 +-
 trunk/tools/perf/ui/gtk/browser.c | 5 ++---
 trunk/tools/perf/util/cache.h     | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b812abdd7220..43c6aeb4bbcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca09b2e1b307724666577859eb460ac6d4c67330
+refs/heads/master: 7706f966323f32f3ea13121b5918851432876ae5
diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c
index cec2b8cee80c..2b20001848f5 100644
--- a/trunk/tools/perf/builtin-report.c
+++ b/trunk/tools/perf/builtin-report.c
@@ -678,7 +678,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
 
 	if (strcmp(report.input_name, "-") != 0) {
 		if (report.use_gtk)
-			perf_gtk_setup_browser(argc, argv, true);
+			perf_gtk_setup_browser(true);
 		else
 			setup_browser(true);
 	} else {
diff --git a/trunk/tools/perf/ui/gtk/browser.c b/trunk/tools/perf/ui/gtk/browser.c
index 258352a2356c..a1a83de3f459 100644
--- a/trunk/tools/perf/ui/gtk/browser.c
+++ b/trunk/tools/perf/ui/gtk/browser.c
@@ -9,10 +9,9 @@
 
 #define MAX_COLUMNS			32
 
-void perf_gtk_setup_browser(int argc, const char *argv[],
-			    bool fallback_to_pager __used)
+void perf_gtk_setup_browser(bool fallback_to_pager __used)
 {
-	gtk_init(&argc, (char ***)&argv);
+	gtk_init(NULL, NULL);
 }
 
 void perf_gtk_exit_browser(bool wait_for_ok __used)
diff --git a/trunk/tools/perf/util/cache.h b/trunk/tools/perf/util/cache.h
index 8dd224df3e54..d22ca689fb15 100644
--- a/trunk/tools/perf/util/cache.h
+++ b/trunk/tools/perf/util/cache.h
@@ -46,14 +46,14 @@ void exit_browser(bool wait_for_ok);
 #endif
 
 #ifdef NO_GTK2_SUPPORT
-static inline void perf_gtk_setup_browser(int argc __used, const char *argv[] __used, bool fallback_to_pager)
+static inline void perf_gtk_setup_browser(bool fallback_to_pager)
 {
 	if (fallback_to_pager)
 		setup_pager();
 }
 static inline void perf_gtk_exit_browser(bool wait_for_ok __used) {}
 #else
-void perf_gtk_setup_browser(int argc, const char *argv[], bool fallback_to_pager);
+void perf_gtk_setup_browser(bool fallback_to_pager);
 void perf_gtk_exit_browser(bool wait_for_ok);
 #endif