From d0accf003c8a8ec142ef387e5c0a377a5a4c08b7 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Wed, 14 Apr 2010 18:39:50 -0400
Subject: [PATCH] --- yaml --- r: 191227 b: refs/heads/master c:
 dda4ab34fe1905d3d590572b776dd92aa0866558 h: refs/heads/master i:   191225:
 80340cd1940eb1d5beff727f4a62cd7a577d3b20   191223:
 8a4253cba3384c17694280e116cfc067cceafed7 v: v3

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

diff --git a/[refs] b/[refs]
index 1261a8ecd5c6..5d000f8234fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3b63d7ae04879a817bac5c0bf09749f73629d32
+refs/heads/master: dda4ab34fe1905d3d590572b776dd92aa0866558
diff --git a/trunk/tools/perf/util/probe-event.c b/trunk/tools/perf/util/probe-event.c
index 954ca210e4b7..5bf8ab034466 100644
--- a/trunk/tools/perf/util/probe-event.c
+++ b/trunk/tools/perf/util/probe-event.c
@@ -290,7 +290,7 @@ int show_line_range(struct line_range *lr)
 
 	if (lr->end == INT_MAX)
 		lr->end = l + NR_ADDITIONAL_LINES;
-	while (l < lr->end && !feof(fp) && ret >= 0)
+	while (l <= lr->end && !feof(fp) && ret >= 0)
 		ret = show_one_line(fp, (l++) - lr->offset, false, false);
 end:
 	fclose(fp);
@@ -341,9 +341,15 @@ int parse_line_range_desc(const char *arg, struct line_range *lr)
 	ptr = strchr(arg, ':');
 	if (ptr) {
 		lr->start = (int)strtoul(ptr + 1, &tmp, 0);
-		if (*tmp == '+')
+		if (*tmp == '+') {
 			lr->end = lr->start + (int)strtoul(tmp + 1, &tmp, 0);
-		else if (*tmp == '-')
+			lr->end--;	/*
+					 * Adjust the number of lines here.
+					 * If the number of lines == 1, the
+					 * the end of line should be equal to
+					 * the start of line.
+					 */
+		} else if (*tmp == '-')
 			lr->end = (int)strtoul(tmp + 1, &tmp, 0);
 		else
 			lr->end = INT_MAX;