Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up fixes and move base from -rc1 to -rc5. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-29 09:02:15 +01:00
parent 1beee96bae 6d3f1e12f4
commit 9de09ace8d
1426 changed files with 83077 additions and 20211 deletions
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -751,7 +751,7 @@ ftrace_profile_write(struct file *filp, const char __user *ubuf,
 out:
 	mutex_unlock(&ftrace_profile_lock);

-	filp->f_pos += cnt;
+	*ppos += cnt;

 	return cnt;
 }