From 3762385e4a6132c6160d2e13cef1dbab84cff61c Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tzanussi@gmail.com>
Date: Tue, 6 Oct 2009 01:00:47 -0500
Subject: [PATCH] --- yaml --- r: 167079 b: refs/heads/master c:
 d4c3768faaae70cdcffc3a5e296bd99edfa7ddb2 h: refs/heads/master i:   167077:
 b26c8719df4e0135e73cdd657ad8f218074682c1   167075:
 dc39c79b8ce37e549e73265ecdd757e0269e6b9a   167071:
 2f0e1038a147c85c0968687589e7d568d5836bc9 v: v3

---
 [refs]                           | 2 +-
 trunk/tools/perf/builtin-trace.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8bac3b1ab646..296209df00b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 933da83aa17939a78d59708321c0b27d0ec8c6ce
+refs/heads/master: d4c3768faaae70cdcffc3a5e296bd99edfa7ddb2
diff --git a/trunk/tools/perf/builtin-trace.c b/trunk/tools/perf/builtin-trace.c
index e9d256e2f47d..0c5e4f72f2ba 100644
--- a/trunk/tools/perf/builtin-trace.c
+++ b/trunk/tools/perf/builtin-trace.c
@@ -219,10 +219,6 @@ static int __cmd_trace(void)
 more:
 	event = (event_t *)(buf + head);
 
-	size = event->header.size;
-	if (!size)
-		size = 8;
-
 	if (head + event->header.size >= page_size * mmap_window) {
 		unsigned long shift = page_size * (head / page_size);
 		int res;
@@ -237,7 +233,6 @@ static int __cmd_trace(void)
 
 	size = event->header.size;
 
-
 	if (!size || process_event(event, offset, head) < 0) {
 
 		/*
@@ -290,7 +285,6 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
 			usage_with_options(annotate_usage, options);
 	}
 
-
 	setup_pager();
 
 	return __cmd_trace();