From db9eaef8c529778e60e5c2fb197871b0484e5d84 Mon Sep 17 00:00:00 2001
From: Thiago Farina <tfransosi@gmail.com>
Date: Sun, 24 Jan 2010 11:03:50 -0500
Subject: [PATCH] --- yaml --- r: 191453 b: refs/heads/master c:
 668eb65f092902eb7dd526af73d4a7f025a94612 h: refs/heads/master i:   191451:
 705c17d5202c490eb83cd7350c952bfad922e370 v: v3

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

diff --git a/[refs] b/[refs]
index 969398095de9..ede3379ea8fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e26ca7150a4f2ab3e69471dfc65f131e7dd7a05
+refs/heads/master: 668eb65f092902eb7dd526af73d4a7f025a94612
diff --git a/trunk/kernel/trace/trace_output.c b/trunk/kernel/trace/trace_output.c
index 8e46b3323cdc..2404c129a8c9 100644
--- a/trunk/kernel/trace/trace_output.c
+++ b/trunk/kernel/trace/trace_output.c
@@ -253,7 +253,7 @@ void *trace_seq_reserve(struct trace_seq *s, size_t len)
 	void *ret;
 
 	if (s->full)
-		return 0;
+		return NULL;
 
 	if (len > ((PAGE_SIZE - 1) - s->len)) {
 		s->full = 1;