git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[safe/jmp/linux-2.6]
/
kernel
/
trace
/
trace_output.c
diff --git
a/kernel/trace/trace_output.c
b/kernel/trace/trace_output.c
index
9cb5df5
..
ab13d70
100644
(file)
--- a/
kernel/trace/trace_output.c
+++ b/
kernel/trace/trace_output.c
@@
-254,7
+254,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;