From 3159e19eb76579ee0de7126f31984cd15d7a7722 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Date: Fri, 4 Feb 2011 21:51:53 +0900
Subject: [PATCH] --- yaml --- r: 234403 b: refs/heads/master c:
 76022db323dd6d7c6958df3d595f7dedf7a14778 h: refs/heads/master i:   234401:
 781679c15d6b587aefbcb457cc174e683d2cdfca   234399:
 5f479715a2b2d1e9d2969b03d254dbe6900341fc v: v3

---
 [refs]                            | 2 +-
 trunk/kernel/trace/trace_kprobe.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2d29a15bc37a..745dd838e4e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f50c2169bd054984e976e67e8651d28f3caf6ba3
+refs/heads/master: 76022db323dd6d7c6958df3d595f7dedf7a14778
diff --git a/trunk/kernel/trace/trace_kprobe.c b/trunk/kernel/trace/trace_kprobe.c
index 2dec9bcde8b4..2088893c049e 100644
--- a/trunk/kernel/trace/trace_kprobe.c
+++ b/trunk/kernel/trace/trace_kprobe.c
@@ -767,16 +767,15 @@ static int __parse_probe_arg(char *arg, const struct fetch_type *t,
 		}
 		break;
 	case '+':	/* deref memory */
+		arg++;	/* Skip '+', because strict_strtol() rejects it. */
 	case '-':
 		tmp = strchr(arg, '(');
 		if (!tmp)
 			break;
 		*tmp = '\0';
-		ret = strict_strtol(arg + 1, 0, &offset);
+		ret = strict_strtol(arg, 0, &offset);
 		if (ret)
 			break;
-		if (arg[0] == '-')
-			offset = -offset;
 		arg = tmp + 1;
 		tmp = strrchr(arg, ')');
 		if (tmp) {