diff --git a/[refs] b/[refs]
index e69e9fb4bfaf..4e22067cd4c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d769041f865330034131525ee6a7f72eb4af2a24
+refs/heads/master: 797d3712a9dd75c720558612be05f42c031a7bb5
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index b542f8837801..c1634068adfa 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -1750,7 +1750,7 @@ static int trace_empty(struct trace_iterator *iter)
 		}
 	}
 
-	return TRACE_TYPE_HANDLED;
+	return 1;
 }
 
 static enum print_line_t print_trace_line(struct trace_iterator *iter)