diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 17:55:31 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 17:55:31 -0400 |
commit | e2b8b2808538a91444e78c7db5a30519cadd09b2 (patch) | |
tree | 60c45581817db746bd61670f5c95b19c2661daa0 /kernel/trace/trace_workqueue.c | |
parent | 4dd163a0512eb91bbcf4e66d2f65b8e4042561b3 (diff) | |
parent | ef18012b248b47ec9a12c3a83ca5e99782d39c5d (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.c | 6 |
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 { | |||
19 | /* Useful to know if we print the cpu headers */ | 19 | /* Useful to know if we print the cpu headers */ |
20 | bool first_entry; | 20 | bool first_entry; |
21 | int cpu; | 21 | int cpu; |
22 | pid_t pid; | 22 | pid_t pid; |
23 | /* Can be inserted from interrupt or user context, need to be atomic */ | 23 | /* Can be inserted from interrupt or user context, need to be atomic */ |
24 | atomic_t inserted; | 24 | atomic_t inserted; |
25 | /* | 25 | /* |
26 | * Don't need to be atomic, works are serialized in a single workqueue thread | 26 | * Don't need to be atomic, works are serialized in a single workqueue thread |
27 | * on a single CPU. | 27 | * on a single CPU. |
28 | */ | 28 | */ |
29 | unsigned int executed; | 29 | unsigned int executed; |
30 | }; | 30 | }; |
31 | 31 | ||
32 | /* List of workqueue threads on one cpu */ | 32 | /* List of workqueue threads on one cpu */ |