projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into tracing/core
[linux-2.6-block.git]
/
kernel
/
trace
/
trace_workqueue.c
diff --git
a/kernel/trace/trace_workqueue.c
b/kernel/trace/trace_workqueue.c
index 797201e4a1376af5987bbce519398b14de3aeada..984b9175c13da60217cf5a14aba71fd4780b0af4 100644
(file)
--- a/
kernel/trace/trace_workqueue.c
+++ b/
kernel/trace/trace_workqueue.c
@@
-152,7
+152,7
@@
static struct cpu_workqueue_stats *workqueue_stat_start_cpu(int cpu)
return ret;
}
-static void *workqueue_stat_start(
void
)
+static void *workqueue_stat_start(
struct tracer_stat *trace
)
{
int cpu;
void *ret = NULL;