From dbcbd5a66509a354f3298f4253c7296041740109 Mon Sep 17 00:00:00 2001
From: Vaibhav Nagarnaik <vnagarnaik@google.com>
Date: Fri, 6 Apr 2012 00:48:03 +0200
Subject: [PATCH] --- yaml --- r: 304980 b: refs/heads/master c:
 b48285980de2070948c8ac73629c605ad9202589 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/tools/lib/traceevent/event-parse.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f63183cd54a6..c3a1730fc7b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2525a0852d81b1cf1155d75d1e3db9682fee191
+refs/heads/master: b48285980de2070948c8ac73629c605ad9202589
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index 4d5092f67167..476626af7317 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -2047,6 +2047,18 @@ static int arg_num_eval(struct print_arg *arg, long long *val)
 				break;
 			*val = left - right;
 			break;
+		case '+':
+			if (arg->op.left->type == PRINT_NULL)
+				left = 0;
+			else
+				ret = arg_num_eval(arg->op.left, &left);
+			if (!ret)
+				break;
+			ret = arg_num_eval(arg->op.right, &right);
+			if (!ret)
+				break;
+			*val = left + right;
+			break;
 		default:
 			do_warning("unknown op '%s'", arg->op.op);
 			ret = 0;