Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4

This commit is contained in:
Steven Rostedt
2010-05-14 09:29:52 -04:00
committed by Steven Rostedt
466 changed files with 8058 additions and 3646 deletions

View File

@@ -3234,8 +3234,7 @@ free:
}
static void
ftrace_graph_probe_sched_switch(struct rq *__rq, struct task_struct *prev,
struct task_struct *next)
ftrace_graph_probe_sched_switch(struct task_struct *prev, struct task_struct *next)
{
unsigned long long timestamp;
int index;