[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-668eb65f092902eb7dd526af73d4a7f025a94612@git.kernel.org>
Date: Fri, 7 May 2010 18:40:24 GMT
From: tip-bot for Thiago Farina <tfransosi@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
rostedt@...dmis.org, tfransosi@...il.com, tglx@...utronix.de
Subject: [tip:tracing/core] tracing: Fix "integer as NULL pointer" warning.
Commit-ID: 668eb65f092902eb7dd526af73d4a7f025a94612
Gitweb: http://git.kernel.org/tip/668eb65f092902eb7dd526af73d4a7f025a94612
Author: Thiago Farina <tfransosi@...il.com>
AuthorDate: Sun, 24 Jan 2010 11:03:50 -0500
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Wed, 5 May 2010 12:01:26 -0400
tracing: Fix "integer as NULL pointer" warning.
kernel/trace/trace_output.c:256:24: warning: Using plain integer as NULL pointer
Signed-off-by: Thiago Farina <tfransosi@...il.com>
LKML-Reference: <1264349038-1766-3-git-send-email-tfransosi@...il.com>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
kernel/trace/trace_output.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 8e46b33..2404c12 100644
--- a/kernel/trace/trace_output.c
+++ b/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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists