diff --git a/[refs] b/[refs] index cd6cef112a9e..2984b64e1434 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4823ed7eadf35e4b57ce581327e21d39585f1f32 +refs/heads/master: 9fe068e92f6290e89e19adc521441661a1229f00 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 49e16630628a..ca0d6ff74c11 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -2417,8 +2417,8 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, mutex_unlock(&trace_types_lock); - /* sleep for one second, and try again. */ - schedule_timeout(HZ); + /* sleep for 100 msecs, and try again. */ + schedule_timeout(HZ/10); mutex_lock(&trace_types_lock);