From f7bc65af7b872a0fa2b4a311013fe75a7c906d2f Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Date: Thu, 21 Oct 2010 19:13:29 +0900
Subject: [PATCH] --- yaml --- r: 218645 b: refs/heads/master c:
 c82ec0a2bd7725a2d2ac3065d8cde13e1f717d3c h: refs/heads/master i:   218643:
 6e7107311eea70d7b762ea9560b178a644febd1e v: v3

---
 [refs]                              | 2 +-
 trunk/tools/perf/builtin-probe.c    | 4 ++--
 trunk/tools/perf/util/probe-event.c | 2 +-
 trunk/tools/perf/util/probe-event.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c2a63908d393..1787ef1c76c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf6eb489e5c04c8f8d5fd7bf90b8346c987688bc
+refs/heads/master: c82ec0a2bd7725a2d2ac3065d8cde13e1f717d3c
diff --git a/trunk/tools/perf/builtin-probe.c b/trunk/tools/perf/builtin-probe.c
index 91bb6cf4e025..c777bec28466 100644
--- a/trunk/tools/perf/builtin-probe.c
+++ b/trunk/tools/perf/builtin-probe.c
@@ -305,8 +305,8 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
 
 	if (params.nevents) {
 		ret = add_perf_probe_events(params.events, params.nevents,
-					    params.force_add,
-					    params.max_probe_points);
+					    params.max_probe_points,
+					    params.force_add);
 		if (ret < 0) {
 			pr_err("  Error: Failed to add events. (%d)\n", ret);
 			return ret;
diff --git a/trunk/tools/perf/util/probe-event.c b/trunk/tools/perf/util/probe-event.c
index 288ebe8279d2..83192a59f02a 100644
--- a/trunk/tools/perf/util/probe-event.c
+++ b/trunk/tools/perf/util/probe-event.c
@@ -1668,7 +1668,7 @@ struct __event_package {
 };
 
 int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
-			  bool force_add, int max_tevs)
+			  int max_tevs, bool force_add)
 {
 	int i, j, ret;
 	struct __event_package *pkgs;
diff --git a/trunk/tools/perf/util/probe-event.h b/trunk/tools/perf/util/probe-event.h
index 727a7fe81a02..83130f634f01 100644
--- a/trunk/tools/perf/util/probe-event.h
+++ b/trunk/tools/perf/util/probe-event.h
@@ -117,7 +117,7 @@ extern int parse_line_range_desc(const char *cmd, struct line_range *lr);
 
 
 extern int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
-				 bool force_add, int max_probe_points);
+				 int max_probe_points, bool force_add);
 extern int del_perf_probe_events(struct strlist *dellist);
 extern int show_perf_probe_events(void);
 extern int show_line_range(struct line_range *lr);