summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_workqueue.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-10 22:55:31 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-10 22:55:31 +0100
commite2b8b2808538a91444e78c7db5a30519cadd09b2 (patch)
tree60c45581817db746bd61670f5c95b19c2661daa0 /kernel/trace/trace_workqueue.c
parent4dd163a0512eb91bbcf4e66d2f65b8e4042561b3 (diff)
parentef18012b248b47ec9a12c3a83ca5e99782d39c5d (diff)
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_workqueue.c')
-rw-r--r--kernel/trace/trace_workqueue.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
index 739fdacf873b..fb5ccac8bbc0 100644
--- a/kernel/trace/trace_workqueue.c
+++ b/kernel/trace/trace_workqueue.c
@@ -19,14 +19,14 @@ struct cpu_workqueue_stats {
/* Useful to know if we print the cpu headers */
bool first_entry;
int cpu;
- pid_t pid;
+ pid_t pid;
/* Can be inserted from interrupt or user context, need to be atomic */
- atomic_t inserted;
+ atomic_t inserted;
/*
* Don't need to be atomic, works are serialized in a single workqueue thread
* on a single CPU.
*/
- unsigned int executed;
+ unsigned int executed;
};
/* List of workqueue threads on one cpu */