Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 100516
b: refs/heads/master
c: 2dc8f09
h: refs/heads/master
v: v3
  • Loading branch information
Steven Rostedt authored and Thomas Gleixner committed May 23, 2008
1 parent c9fdbb0 commit ac37281
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 845279972f1736c3463c9cebd1bad92a0a347176
refs/heads/master: 2dc8f09571a61d9cb3dc47bba6608689dfe15d16
4 changes: 4 additions & 0 deletions trunk/kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -2233,6 +2233,10 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
start = 0;

while (trace_empty(iter)) {

if ((filp->f_flags & O_NONBLOCK))
return -EAGAIN;

/*
* This is a make-shift waitqueue. The reason we don't use
* an actual wait queue is because:
Expand Down

0 comments on commit ac37281

Please sign in to comment.