summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorThiago Farina <tfransosi@gmail.com>2010-01-24 17:03:50 +0100
committerSteven Rostedt <rostedt@goodmis.org>2010-05-05 18:01:26 +0200
commit668eb65f092902eb7dd526af73d4a7f025a94612 (patch)
tree2ef89525a77f0541bf527dc33325969cf360c4a4 /kernel/trace
parenttracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header (diff)
downloadlinux-668eb65f092902eb7dd526af73d4a7f025a94612.tar.xz
linux-668eb65f092902eb7dd526af73d4a7f025a94612.zip
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@gmail.com> LKML-Reference: <1264349038-1766-3-git-send-email-tfransosi@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 8e46b3323cdc..2404c129a8c9 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;