diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /include/linux/padata.h | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'include/linux/padata.h')
| -rw-r--r-- | include/linux/padata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/padata.h b/include/linux/padata.h index bdcd1e9eacea..4633b2f726b6 100644 --- a/include/linux/padata.h +++ b/include/linux/padata.h | |||
| @@ -127,8 +127,8 @@ struct padata_cpumask { | |||
| 127 | */ | 127 | */ |
| 128 | struct parallel_data { | 128 | struct parallel_data { |
| 129 | struct padata_instance *pinst; | 129 | struct padata_instance *pinst; |
| 130 | struct padata_parallel_queue *pqueue; | 130 | struct padata_parallel_queue __percpu *pqueue; |
| 131 | struct padata_serial_queue *squeue; | 131 | struct padata_serial_queue __percpu *squeue; |
| 132 | atomic_t seq_nr; | 132 | atomic_t seq_nr; |
| 133 | atomic_t reorder_objects; | 133 | atomic_t reorder_objects; |
| 134 | atomic_t refcnt; | 134 | atomic_t refcnt; |